From bf73fce4c2eb8b973aa10dfee1f91aadff4bf367 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <sascha-pgp@silbe.org>
Date: Wed, 16 Jun 2010 17:58:25 +0000
Subject: add/remove some empty lines according to PEP8

---
diff --git a/browser.py b/browser.py
index 552c633..ece81d1 100644
--- a/browser.py
+++ b/browser.py
@@ -43,6 +43,7 @@ from progresslistener import ProgressListener
 
 _ZOOM_AMOUNT = 0.1
 
+
 class GetSourceListener(object):
     _com_interfaces_ = interfaces.nsIWebProgressListener
 
@@ -69,8 +70,11 @@ class GetSourceListener(object):
     def onSecurityChange(self, progress, request, state):
         pass
 
+
 class CommandListener(object):
+
     _com_interfaces_ = interfaces.nsIDOMEventListener
+
     def __init__(self, window):
         self._window = window
 
@@ -86,6 +90,7 @@ class CommandListener(object):
         cert_exception = cls.createInstance(interfaces.hulahopAddCertException)
         cert_exception.showDialog(self._window)
 
+
 class TabbedView(gtk.Notebook):
     __gtype_name__ = 'TabbedView'
 
@@ -198,6 +203,7 @@ class TabbedView(gtk.Notebook):
             self._append_tab(browser)
             sessionstore.set_session(browser, tab_session)
 
+
 gtk.rc_parse_string('''
     style "browse-tab-close" {
         xthickness = 0
@@ -205,6 +211,7 @@ gtk.rc_parse_string('''
     }
     widget "*browse-tab-close" style "browse-tab-close"''')
 
+
 class TabLabel(gtk.HBox):
     __gtype_name__ = 'TabLabel'
 
@@ -255,6 +262,7 @@ class TabLabel(gtk.HBox):
     def __title_changed_cb(self, browser, pspec):
         self._label.set_text(browser.props.title)
 
+
 class Browser(WebView):
     __gtype_name__ = 'Browser'
 
@@ -335,6 +343,7 @@ class Browser(WebView):
                     interfaces.nsIMarkupDocumentViewer)
             markupDocumentViewer.fullZoom -= _ZOOM_AMOUNT
 
+
 class PopupDialog(gtk.Window):
     def __init__(self):
         gtk.Window.__init__(self)
@@ -354,4 +363,3 @@ class PopupDialog(gtk.Window):
         if self.view.props.visibility:
             self.view.show()
             self.show()
-
diff --git a/downloadmanager.py b/downloadmanager.py
index 03196aa..3eec649 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -59,9 +59,11 @@ _MIN_PERCENT_UPDATE = 10
 _active_downloads = []
 _dest_to_window = {}
 
+
 def can_quit():
     return len(_active_downloads) == 0
 
+
 def remove_all_downloads():
     for download in _active_downloads:
         download.cancelable.cancel(NS_ERROR_FAILURE)
@@ -70,6 +72,7 @@ def remove_all_downloads():
             datastore.delete(download.dl_jobject.object_id)
             download.cleanup_datastore_write()
 
+
 class HelperAppLauncherDialog:
     _com_interfaces_ = interfaces.nsIHelperAppLauncherDialog
 
@@ -107,11 +110,13 @@ class HelperAppLauncherDialog:
         launcher.saveToDisk(None, False)
         return NS_OK
 
+
 components.registrar.registerFactory('{64355793-988d-40a5-ba8e-fcde78cac631}',
                                      'Sugar Download Manager',
                                      '@mozilla.org/helperapplauncherdialog;1',
                                      Factory(HelperAppLauncherDialog))
 
+
 class Download:
     _com_interfaces_ = interfaces.nsITransfer
 
@@ -291,11 +296,13 @@ class Download:
             self.cancelable.cancel(NS_ERROR_FAILURE) #NS_BINDING_ABORTED)
             _active_downloads.remove(self)
 
+
 components.registrar.registerFactory('{23c51569-e9a1-4a92-adeb-3723db82ef7c}',
                                      'Sugar Download',
                                      '@mozilla.org/transfer;1',
                                      Factory(Download))
 
+
 def save_link(url, text, owner_document):
     # Inspired on Firefox' browser/base/content/nsContextMenu.js:saveLink()
 
@@ -326,6 +333,7 @@ def save_link(url, text, owner_document):
             interfaces.nsIStreamListener)
     channel.asyncOpen(listener, None)
 
+
 def _implements_interface(obj, interface):
     try:
         obj.QueryInterface(interface)
@@ -336,6 +344,7 @@ def _implements_interface(obj, interface):
         else:
             raise
 
+
 class _AuthPromptCallback(object):
     _com_interfaces_ = interfaces.nsIInterfaceRequestor
 
@@ -349,6 +358,7 @@ class _AuthPromptCallback(object):
             return window_watcher.getPrompt(self._dom_window, uuid)
         return None
 
+
 class _SaveLinkProgressListener(object):
     _com_interfaces_ = interfaces.nsIStreamListener
 
@@ -383,4 +393,3 @@ class _SaveLinkProgressListener(object):
     def onDataAvailable(self, request, context, inputStream, offset, count):
         self._external_listener.onDataAvailable(request, context, inputStream,
                                                 offset, count);
-
diff --git a/edittoolbar.py b/edittoolbar.py
index 67876fd..4658683 100644
--- a/edittoolbar.py
+++ b/edittoolbar.py
@@ -26,6 +26,7 @@ from sugar.graphics import iconentry
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics import style
 
+
 class EditToolbar(activity.EditToolbar):
 
     _com_interfaces_ = interfaces.nsIObserver
diff --git a/filepicker.py b/filepicker.py
index d5e8ea0..9b9e8bc 100644
--- a/filepicker.py
+++ b/filepicker.py
@@ -31,8 +31,10 @@ from xpcom.server.factory import Factory
 from sugar.graphics.objectchooser import ObjectChooser
 from sugar.activity.activity import get_activity_root
 
+
 _temp_dirs_to_clean = []
 
+
 def cleanup_temp_files():
     while _temp_dirs_to_clean:
         temp_dir = _temp_dirs_to_clean.pop()
@@ -42,6 +44,7 @@ def cleanup_temp_files():
             logging.debug('filepicker.cleanup_temp_files: no file %r'
                           % temp_dir)
 
+
 class FilePicker:
     _com_interfaces_ = interfaces.nsIFilePicker
 
@@ -145,11 +148,13 @@ class FilePicker:
         logging.warning('FilePicker.get_FileURL: UNIMPLEMENTED')
         return None
 
+
 components.registrar.registerFactory(FilePicker.cid,
                                         FilePicker.description,
                                         '@mozilla.org/filepicker;1',
                                         Factory(FilePicker))
 
+
 def _basename_strip(jobject):
     name = jobject.metadata.get('title', 'untitled')
     name = name.replace(os.sep, ' ').strip()
diff --git a/globalhistory.py b/globalhistory.py
index 1c9d62d..1ec0a72 100644
--- a/globalhistory.py
+++ b/globalhistory.py
@@ -22,6 +22,7 @@ from xpcom.server.factory import Factory
 
 import places
 
+
 class GlobalHistory:
     _com_interfaces_ = interfaces.nsIGlobalHistory, \
                        interfaces.nsIGlobalHistory2, \
@@ -72,6 +73,7 @@ class GlobalHistory:
             place.gecko_flags = flags
             self._store.update_place(place)
 
+
 components.registrar.registerFactory(GlobalHistory.cid,
                                      GlobalHistory.description,
                                      '@mozilla.org/browser/global-history;2',
diff --git a/linkbutton.py b/linkbutton.py
index 76101b6..3247c7b 100644
--- a/linkbutton.py
+++ b/linkbutton.py
@@ -34,6 +34,7 @@ class LinkButton(TrayButton, gobject.GObject):
         'remove_link': (gobject.SIGNAL_RUN_FIRST,
                         gobject.TYPE_NONE, ([str]))
         }
+
     def __init__(self, url, buf, color, title, owner, index, hash):
         TrayButton.__init__(self)
         self.set_image(buf, color.split(',')[1], color.split(',')[0])
diff --git a/messenger.py b/messenger.py
index 6d8a035..a1aacda 100644
--- a/messenger.py
+++ b/messenger.py
@@ -21,12 +21,14 @@ import dbus
 from dbus.gobject_service import ExportedGObject
 import base64
 
+
 SERVICE = "org.laptop.WebActivity"
 IFACE = SERVICE
 PATH = "/org/laptop/WebActivity"
 
 _logger = logging.getLogger('messenger')
 
+
 class Messenger(ExportedGObject):
     def __init__(self, tube, is_initiator, model):
         ExportedGObject.__init__(self, tube, PATH)
@@ -124,4 +126,3 @@ class Messenger(ExportedGObject):
             thumb = base64.b64decode(buf)
             self.model.add_link(url, title, thumb, owner, color, timestamp)
             _logger.debug('Added link: %s to linkbar.'%(url))
-
diff --git a/model.py b/model.py
index da9d1bc..65e5647 100644
--- a/model.py
+++ b/model.py
@@ -21,6 +21,7 @@ import sha
 import gobject
 import base64
 
+
 class Model(gobject.GObject):
     ''' The model of web-activity which uses json to serialize its data
     to a file and deserealize from it.
@@ -76,4 +77,3 @@ class Model(gobject.GObject):
         ids.extend(self.data['deleted'])
         ids.append('')
         return ids
-
diff --git a/palettes.py b/palettes.py
index e9a1e3c..0d4023a 100644
--- a/palettes.py
+++ b/palettes.py
@@ -34,6 +34,7 @@ from sugar.activity import activity
 
 import downloadmanager
 
+
 class MouseOutListener(gobject.GObject):
     _com_interfaces_ = interfaces.nsIDOMEventListener
 
@@ -192,6 +193,7 @@ class LinkPalette(Palette):
     def __download_activate_cb(self, menu_item):
         downloadmanager.save_link(self._url, self._title, self._owner_document)
 
+
 class ImagePalette(Palette):
     def __init__(self, title, url, owner_document):
         Palette.__init__(self)
@@ -254,6 +256,7 @@ class ImagePalette(Palette):
     def __download_activate_cb(self, menu_item):
         downloadmanager.save_link(self._url, self._title, self._owner_document)
 
+
 class _ImageProgressListener(object):
     _com_interfaces_ = interfaces.nsIWebProgressListener
 
@@ -282,10 +285,11 @@ class _ImageProgressListener(object):
                                     _clipboard_clear_func_cb,
                                     self._temp_file)
 
+
 def _clipboard_get_func_cb(clipboard, selection_data, info, temp_file):
     selection_data.set_uris(['file://' + temp_file])
 
+
 def _clipboard_clear_func_cb(clipboard, temp_file):
     if os.path.exists(temp_file):
         os.remove(temp_file)
-
diff --git a/places.py b/places.py
index d2667d2..38fa7b2 100644
--- a/places.py
+++ b/places.py
@@ -22,6 +22,7 @@ from sugar.activity import activity
 
 _store = None
 
+
 class Place(object):
     def __init__(self, uri=None):
         self.uri = uri
@@ -31,6 +32,7 @@ class Place(object):
         self.visits = 0
         self.last_visit = datetime.now()
 
+
 class SqliteStore(object):
     MAX_SEARCH_MATCHES = 20
     EXPIRE_DAYS = 30
@@ -131,6 +133,7 @@ class SqliteStore(object):
         finally:
             cursor.close()
 
+
 def get_store():
     global _store
     if _store == None:
diff --git a/progresslistener.py b/progresslistener.py
index b3e401c..fb08b13 100644
--- a/progresslistener.py
+++ b/progresslistener.py
@@ -20,6 +20,7 @@ import gobject
 import xpcom
 from xpcom.components import interfaces
 
+
 class ProgressListener(gobject.GObject):
     _com_interfaces_ = interfaces.nsIWebProgressListener
 
@@ -100,4 +101,3 @@ class ProgressListener(gobject.GObject):
         return self._progress
 
     progress = gobject.property(type=float, getter=_get_progress)
-
diff --git a/promptservice.py b/promptservice.py
index 5f8f9d2..bab2417 100644
--- a/promptservice.py
+++ b/promptservice.py
@@ -21,6 +21,7 @@ from xpcom import components
 from xpcom.components import interfaces
 from xpcom.server.factory import Factory
 
+
 class PromptService:
     _com_interfaces_ = interfaces.nsIPromptService
 
@@ -66,4 +67,3 @@ class PromptService:
 #                                     PromptService.description,
 #                                     '@mozilla.org/embedcomp/prompt-service;1',
 #                                     Factory(PromptService))
-
diff --git a/securitydialogs.py b/securitydialogs.py
index 29e5825..dbfd749 100644
--- a/securitydialogs.py
+++ b/securitydialogs.py
@@ -21,6 +21,7 @@ from xpcom import components
 from xpcom.components import interfaces
 from xpcom.server.factory import Factory
 
+
 class SecurityDialogs:
     _com_interfaces_ = interfaces.nsIBadCertListener
 
diff --git a/sessionhistory.py b/sessionhistory.py
index 50166cb..2211551 100644
--- a/sessionhistory.py
+++ b/sessionhistory.py
@@ -20,6 +20,7 @@ import gobject
 import xpcom
 from xpcom.components import interfaces
 
+
 class HistoryListener(gobject.GObject):
     _com_interfaces_ = interfaces.nsISHistoryListener
 
diff --git a/sessionstore.py b/sessionstore.py
index 3ea7875..e09c3a1 100644
--- a/sessionstore.py
+++ b/sessionstore.py
@@ -22,6 +22,7 @@ import logging
 from xpcom import components
 from xpcom.components import interfaces
 
+
 def get_session(browser):
     session_history = browser.web_navigation.sessionHistory
 
@@ -29,6 +30,7 @@ def get_session(browser):
         return ''
     return _get_history(session_history)
 
+
 def set_session(browser, data):
     _set_history(browser.web_navigation.sessionHistory, data)
 
@@ -37,6 +39,7 @@ def set_session(browser, data):
     else:
         browser.load_uri('about:blank')
 
+
 def _get_history(history):
     logging.debug('%r' % history.count)
     entries_dest = []
@@ -49,6 +52,7 @@ def _get_history(history):
 
     return entries_dest
 
+
 def _set_history(history, history_data):
     history_internal = history.queryInterface(interfaces.nsISHistoryInternal)
 
@@ -68,4 +72,3 @@ def _set_history(history, history_data):
         entry.setTitle(entry_dict['title'])
 
         history_internal.addEntry(entry, True)
-
diff --git a/setup.py b/setup.py
index fae74b8..530f97c 100755
--- a/setup.py
+++ b/setup.py
@@ -19,4 +19,3 @@
 from sugar.activity import bundlebuilder
 
 bundlebuilder.start()
-
diff --git a/viewtoolbar.py b/viewtoolbar.py
index 4f13e73..61f4943 100644
--- a/viewtoolbar.py
+++ b/viewtoolbar.py
@@ -21,6 +21,7 @@ import gtk
 
 from sugar.graphics.toolbutton import ToolButton
 
+
 class ViewToolbar(gtk.Toolbar):
     def __init__(self, activity):
         gtk.Toolbar.__init__(self)
@@ -90,4 +91,3 @@ class ViewToolbar(gtk.Toolbar):
     def tray_set_hide(self):
         self.traybutton.set_icon('tray-hide')
         self.traybutton.set_tooltip(_('Hide Tray'))
-
diff --git a/webactivity.py b/webactivity.py
index 3a2cfeb..48cd90f 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -70,6 +70,7 @@ if _profile_version < PROFILE_VERSION:
     f.write(str(PROFILE_VERSION))
     f.close()
 
+
 def _seed_xs_cookie():
     ''' Create a HTTP Cookie to authenticate with the Schoolserver
     '''
@@ -133,6 +134,7 @@ hulahop.startup(_profile_path)
 
 from xpcom import components
 
+
 def _set_accept_languages():
     ''' Set intl.accept_languages based on the locale
     '''
@@ -172,6 +174,7 @@ PATH = "/org/laptop/WebActivity"
 
 _logger = logging.getLogger('web-activity')
 
+
 class WebActivity(activity.Activity):
     def __init__(self, handle):
         activity.Activity.__init__(self, handle)
@@ -555,4 +558,3 @@ class WebActivity(activity.Activity):
     def get_document_path(self, async_cb, async_err_cb):
         browser = self._tabbed_view.props.current_browser
         browser.get_source(async_cb, async_err_cb)
-
diff --git a/webtoolbar.py b/webtoolbar.py
index d1ac9db..e7c20be 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -35,8 +35,10 @@ from sugar.activity import activity
 import filepicker
 import places
 
+
 _MAX_HISTORY_ENTRIES = 15
 
+
 class WebEntry(AddressEntry):
     _COL_ADDRESS = 0
     _COL_TITLE = 1
@@ -216,6 +218,7 @@ class WebEntry(AddressEntry):
         else:
             self._search_popup()
 
+
 class PrimaryToolbar(ToolbarBox):
     __gtype_name__ = 'PrimaryToolbar'
 
@@ -457,4 +460,3 @@ class PrimaryToolbar(ToolbarBox):
 
     def _link_add_clicked_cb(self, button):
         self.emit('add-link')
-
--
cgit v0.9.1