matching mainline

14 files changed, 125 insertions, 120 deletions

diff --git a/browser.py b/browser.py
index 7b0ec1d..b9c1f69 100644
--- a/browser.py
+++ b/browser.py
@@ -53,8 +53,8 @@ class GetSourceListener(object):
         self._async_err_cb = async_err_cb
 
     def onStateChange(self, webProgress, request, stateFlags, status):
-        if stateFlags & interfaces.nsIWebProgressListener.STATE_IS_REQUEST and \
-                stateFlags & interfaces.nsIWebProgressListener.STATE_STOP:
+        if (stateFlags & interfaces.nsIWebProgressListener.STATE_IS_REQUEST and
+            stateFlags & interfaces.nsIWebProgressListener.STATE_STOP):
             self._async_cb(self._file_path)
 
     def onProgressChange(self, progress, request, curSelfProgress,
@@ -127,8 +127,8 @@ class TabbedView(gtk.Notebook):
                     interfaces.nsIStyleSheetService.AGENT_SHEET)
 
         if os.path.exists(TabbedView.USER_SHEET):
-            user_sheet_uri = io_service.newURI('file:///' + TabbedView.USER_SHEET,
-                                               None, None)
+            url = 'file:///' + TabbedView.USER_SHEET
+            user_sheet_uri = io_service.newURI(url, None, None)
             style_sheet_service.loadAndRegisterSheet(user_sheet_uri,
                     interfaces.nsIStyleSheetService.USER_SHEET)
 
@@ -181,7 +181,8 @@ class TabbedView(gtk.Notebook):
     def _get_current_browser(self):
         return self.get_nth_page(self.get_current_page())
 
-    current_browser = gobject.property(type=object, getter=_get_current_browser)
+    current_browser = gobject.property(type=object,
+                                       getter=_get_current_browser)
 
     def get_session(self):
         tab_sessions = []
@@ -218,7 +219,7 @@ class TabLabel(gtk.HBox):
     __gsignals__ = {
         'tab-close': (gobject.SIGNAL_RUN_FIRST,
                       gobject.TYPE_NONE,
-                      ([object]))
+                      ([object])),
     }
 
     def __init__(self, browser):
@@ -248,11 +249,13 @@ class TabLabel(gtk.HBox):
         self.emit('tab-close', self._browser)
 
     def __browser_is_setup_cb(self, browser):
-        browser.progress.connect('notify::location', self.__location_changed_cb)
+        browser.progress.connect('notify::location',
+                                 self.__location_changed_cb)
         browser.connect('notify::title', self.__title_changed_cb)
 
     def __location_changed_cb(self, progress_listener, pspec):
-        self._label.set_text(self._browser.get_url_from_nsiuri(progress_listener.location))
+        url = self._browser.get_url_from_nsiuri(progress_listener.location)
+        self._label.set_text(url)
 
     def __title_changed_cb(self, browser, pspec):
         self._label.set_text(browser.props.title)
@@ -263,8 +266,8 @@ class Browser(WebView):
 
     __gsignals__ = {
         'is-setup': (gobject.SIGNAL_RUN_FIRST,
-                  gobject.TYPE_NONE,
-                  ([]))
+                     gobject.TYPE_NONE,
+                     ([])),
     }
 
     def __init__(self):
@@ -295,7 +298,6 @@ class Browser(WebView):
 
         self.emit('is-setup')
 
-
     def get_url_from_nsiuri(self, uri):
         """
         get a nsIURI object and return a string with the url
diff --git a/downloadmanager.py b/downloadmanager.py
index ba2b0a5..934693f 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -38,6 +38,7 @@ from sugar.graphics.alert import Alert, TimeoutAlert
 from sugar.graphics.icon import Icon
 from sugar.graphics import style
 from sugar.activity import activity
+
 # #3903 - this constant can be removed and assumed to be 1 when dbus-python
 # 0.82.3 is the only version used
 import dbus
@@ -67,7 +68,6 @@ def can_quit():
 def remove_all_downloads():
     for download in _active_downloads:
         download.cancelable.cancel(NS_ERROR_FAILURE)
-        download._delete_partial_download()
         if download.dl_jobject is not None:
             download.datastore_deleted_handler.remove()
             datastore.delete(download.dl_jobject.object_id)
@@ -96,12 +96,14 @@ class HelperAppLauncherDialog:
         temp_path = os.path.join(activity.get_activity_root(), 'instance')
         if not os.path.exists(temp_path):
             os.makedirs(temp_path)
-        fd, file_path = tempfile.mkstemp(dir=temp_path, prefix=base_name, suffix=extension)
+        fd, file_path = tempfile.mkstemp(dir=temp_path, prefix=base_name,
+                                         suffix=extension)
         os.close(fd)
         os.chmod(file_path, 0644)
         dest_file.initWithPath(file_path)
 
-        requestor = window_context.queryInterface(interfaces.nsIInterfaceRequestor)
+        interface_id = interfaces.nsIInterfaceRequestor
+        requestor = window_context.queryInterface(interface_id)
         dom_window = requestor.getInterface(interfaces.nsIDOMWindow)
         _dest_to_window[file_path] = dom_window
 
@@ -142,14 +144,14 @@ class Download:
         del _dest_to_window[file_path]
 
         view = hulahop.get_view_for_window(dom_window)
-        logging.debug('Download.init dom_window: %r' % dom_window)
+        logging.debug('Download.init dom_window: %r', dom_window)
         self._activity = view.get_toplevel()
 
         return NS_OK
 
     def onStatusChange(self, web_progress, request, status, message):
-        logging.info('Download.onStatusChange(%r, %r, %r, %r)' % \
-            (web_progress, request, status, message))
+        logging.info('Download.onStatusChange(%r, %r, %r, %r)',
+                     web_progress, request, status, message)
 
     def onStateChange(self, web_progress, request, state_flags, status):
         if state_flags & interfaces.nsIWebProgressListener.STATE_START:
@@ -167,8 +169,8 @@ class Download:
 
         elif state_flags & interfaces.nsIWebProgressListener.STATE_STOP:
             if NS_FAILED(status):
-                    self._delete_partial_download()  # download cancelled
-                    return
+                # download cancelled
+                return
 
             self._stop_alert = Alert()
             self._stop_alert.props.title = _('Download completed')
@@ -246,24 +248,16 @@ class Download:
         preview_data = ''.join(preview_data)
         return dbus.ByteArray(preview_data)
 
-    def _delete_partial_download(self):
-        file_path = self._target_file.path.encode('utf-8', 'replace')
-        if os.path.exists(file_path):
-            os.unlink(file_path)
-        if os.path.exists(file_path + ".part"):
-            os.unlink(file_path + ".part")
-
     def __start_response_cb(self, alert, response_id):
         global _active_downloads
         if response_id is gtk.RESPONSE_CANCEL:
             logging.debug('Download Canceled')
-            self._delete_partial_download()
             self.cancelable.cancel(NS_ERROR_FAILURE)
             try:
                 self.datastore_deleted_handler.remove()
                 datastore.delete(self._object_id)
-            except Exception, e:
-                logging.warning('Object has been deleted already %s' % e)
+            except Exception:
+                logging.exception('Object has been deleted already')
             if self.dl_jobject is not None:
                 self.cleanup_datastore_write()
             if self._stop_alert is not None:
@@ -282,7 +276,6 @@ class Download:
         global _active_downloads
         _active_downloads.remove(self)
 
-        file_path = self._target_file.path.encode('utf-8', 'replace')
         if os.path.isfile(self.dl_jobject.file_path):
             os.remove(self.dl_jobject.file_path)
         self.dl_jobject.destroy()
@@ -292,7 +285,7 @@ class Download:
         self.cleanup_datastore_write()
 
     def _internal_save_error_cb(self, err):
-        logging.debug("Error saving activity object to datastore: %s" % err)
+        logging.error('Error saving activity object to datastore: %s', err)
         self.cleanup_datastore_write()
 
     def onProgressChange64(self, web_progress, request, cur_self_progress,
@@ -349,13 +342,12 @@ class Download:
             arg0=self.dl_jobject.object_id)
 
     def __datastore_deleted_cb(self, uid):
-        logging.debug('Downloaded entry has been deleted from the datastore: %r'
-                      % uid)
+        logging.debug('Downloaded entry has been deleted from the data'
+                      ' store: %r', uid)
         global _active_downloads
         if self in _active_downloads:
             # TODO: Use NS_BINDING_ABORTED instead of NS_ERROR_FAILURE.
-            self._delete_partial_download()
-            self.cancelable.cancel(NS_ERROR_FAILURE)  # NS_BINDING_ABORTED)
+            self.cancelable.cancel(NS_ERROR_FAILURE)
             _active_downloads.remove(self)
 
 
@@ -438,9 +430,10 @@ class _SaveLinkProgressListener(object):
             logging.error("Error downloading link")
             return
 
-        cls = components.classes[
-                "@mozilla.org/uriloader/external-helper-app-service;1"]
-        external_helper = cls.getService(interfaces.nsIExternalHelperAppService)
+        class_name = '@mozilla.org/uriloader/external-helper-app-service;1'
+        cls = components.classes[class_name]
+        interface_id = interfaces.nsIExternalHelperAppService
+        external_helper = cls.getService(interface_id)
 
         channel = request.QueryInterface(interfaces.nsIChannel)
 
diff --git a/edittoolbar.py b/edittoolbar.py
index 4658683..f238647 100644
--- a/edittoolbar.py
+++ b/edittoolbar.py
@@ -121,7 +121,8 @@ class EditToolbar(activity.EditToolbar):
     def _get_command_manager(self):
         tabbed_view = self._activity.get_canvas()
         web_browser = tabbed_view.props.current_browser.browser
-        requestor = web_browser.queryInterface(interfaces.nsIInterfaceRequestor)
+        interface_id = interfaces.nsIInterfaceRequestor
+        requestor = web_browser.queryInterface(interface_id)
         return requestor.getInterface(interfaces.nsICommandManager)
 
     def __search_entry_activate_cb(self, entry):
diff --git a/filepicker.py b/filepicker.py
index ae5b4f1..5cfc889 100644
--- a/filepicker.py
+++ b/filepicker.py
@@ -41,8 +41,8 @@ def cleanup_temp_files():
         if os.path.isdir(temp_dir):
             shutil.rmtree(temp_dir, ignore_errors=True)
         else:
-            logging.debug('filepicker.cleanup_temp_files: no file %r'
-                          % temp_dir)
+            logging.debug('filepicker.cleanup_temp_files: no file %r',
+                          temp_dir)
 
 
 class FilePicker:
@@ -131,7 +131,7 @@ class FilePicker:
         return None
 
     def get_file(self):
-        logging.debug('FilePicker.get_file: %r' % self._file)
+        logging.debug('FilePicker.get_file: %r', self._file)
         if self._file:
             cls = components.classes["@mozilla.org/file/local;1"]
             local_file = cls.createInstance(interfaces.nsILocalFile)
diff --git a/linkbutton.py b/linkbutton.py
index 3247c7b..4a0a18f 100644
--- a/linkbutton.py
+++ b/linkbutton.py
@@ -32,7 +32,7 @@ class LinkButton(TrayButton, gobject.GObject):
     __gtype_name__ = 'LinkButton'
     __gsignals__ = {
         'remove_link': (gobject.SIGNAL_RUN_FIRST,
-                        gobject.TYPE_NONE, ([str]))
+                        gobject.TYPE_NONE, ([str])),
         }
 
     def __init__(self, url, buf, color, title, owner, index, hash):
@@ -40,7 +40,7 @@ class LinkButton(TrayButton, gobject.GObject):
         self.set_image(buf, color.split(',')[1], color.split(',')[0])
 
         self.hash = hash
-        info = title +'\n'+ owner
+        info = title + '\n' + owner
         self.setup_rollover_options(info)
 
     def set_image(self, buf, fill='#0000ff', stroke='#4d4c4f'):
diff --git a/messenger.py b/messenger.py
index a1aacda..4628afa 100644
--- a/messenger.py
+++ b/messenger.py
@@ -41,11 +41,11 @@ class Messenger(ExportedGObject):
         self.tube.watch_participants(self.participant_change_cb)
 
     def participant_change_cb(self, added, removed):
-        _logger.debug('Participants change add=%s    rem=%s'
-                      %(added, removed))
+        _logger.debug('Participants change add=%s    rem=%s',
+                      added, removed)
         for handle, bus_name in added:
-            _logger.debug('Add member handle=%s  bus_name=%s'
-                          %(str(handle), str(bus_name)))
+            _logger.debug('Add member handle=%s  bus_name=%s',
+                          handle, bus_name)
             self.members.append(bus_name)
 
         for handle in removed:
@@ -62,18 +62,18 @@ class Messenger(ExportedGObject):
                                           byte_arrays=True)
             self.bus_name = self.tube.get_unique_name()
             if self.is_initiator:
-                _logger.debug('Initialising a new shared browser, I am %s .'
-                              %self.tube.get_unique_name())
+                _logger.debug('Initialising a new shared browser, I am %s .',
+                              self.tube.get_unique_name())
             else:
                 # sync with other members
-                _logger.debug('Joined I am %s .'%self.bus_name)
+                _logger.debug('Joined I am %s .', self.bus_name)
                 for member in self.members:
                     if member != self.bus_name:
-                        _logger.debug('Get info from %s' %member)
+                        _logger.debug('Get info from %s', member)
                         self.tube.get_object(member, PATH).sync_with_members(
                             self.model.get_links_ids(), dbus_interface=IFACE,
                             reply_handler=self.reply_sync, error_handler=lambda
-                            e:self.error_sync(e, 'transfering file'))
+                            e: self.error_sync(e, 'transfering file'))
 
         self.entered = True
 
@@ -86,7 +86,7 @@ class Messenger(ExportedGObject):
                     link['owner'], link['thumb'], link['timestamp'])
 
     def error_sync(self, e, when):
-        _logger.error('Error %s: %s'%(when, e))
+        _logger.error('Error %s: %s', when, e)
 
     @dbus.service.method(dbus_interface=IFACE, in_signature='as',
                          out_signature='ass', sender_keyword='sender')
@@ -116,7 +116,7 @@ class Messenger(ExportedGObject):
     @dbus.service.signal(IFACE, signature='sssssd')
     def _add_link(self, url, title, color, owner, thumb, timestamp):
         '''Signal to send the link information (add)'''
-        _logger.debug('Add Link: %s '%url)
+        _logger.debug('Add Link: %s ', url)
 
     def _add_link_receiver(self, url, title, color, owner, buf, timestamp,
                            sender=None):
@@ -125,4 +125,4 @@ class Messenger(ExportedGObject):
         if self.tube.self_handle != handle:
             thumb = base64.b64decode(buf)
             self.model.add_link(url, title, thumb, owner, color, timestamp)
-            _logger.debug('Added link: %s to linkbar.'%(url))
+            _logger.debug('Added link: %s to linkbar.', url)
diff --git a/model.py b/model.py
index 65e5647..f6d7eae 100644
--- a/model.py
+++ b/model.py
@@ -28,7 +28,7 @@ class Model(gobject.GObject):
     '''
     __gsignals__ = {
         'add_link': (gobject.SIGNAL_RUN_FIRST,
-                     gobject.TYPE_NONE, ([int]))
+                     gobject.TYPE_NONE, ([int])),
         }
 
     def __init__(self):
@@ -44,13 +44,11 @@ class Model(gobject.GObject):
                 index = self.data['shared_links'].index(item)
                 break
 
-        self.data['shared_links'].insert(index,
-                                         {'hash':sha.new(str(url)).hexdigest(),
-                                          'url':str(url), 'title':str(title),
-                                          'thumb':base64.b64encode(thumb),
-                                          'owner':str(owner),
-                                          'color':str(color),
-                                          'timestamp':float(timestamp)})
+        info = {'hash': sha.new(str(url)).hexdigest(), 'url': str(url),
+                'title': str(title), 'thumb': base64.b64encode(thumb),
+                'owner': str(owner), 'color': str(color),
+                'timestamp': float(timestamp)}
+        self.data['shared_links'].insert(index, info)
         self.emit('add_link', index)
 
     def remove_link(self, hash):
@@ -65,10 +63,8 @@ class Model(gobject.GObject):
 
     def deserialize(self, data):
         self.data = cjson.decode(data)
-        if not self.data.has_key('shared_links'):
-            self.data['shared_links'] = []
-        if not self.data.has_key('deleted'):
-            self.data['deleted'] = []
+        self.data.setdefault('shared_links', [])
+        self.data.setdefault('deleted', [])
 
     def get_links_ids(self):
         ids = []
diff --git a/palettes.py b/palettes.py
index 0d4023a..9fbc370 100644
--- a/palettes.py
+++ b/palettes.py
@@ -41,7 +41,7 @@ class MouseOutListener(gobject.GObject):
     __gsignals__ = {
         'mouse-out': (gobject.SIGNAL_RUN_FIRST,
                       gobject.TYPE_NONE,
-                      ([]))
+                      ([])),
     }
 
     def __init__(self, target):
@@ -97,7 +97,8 @@ class ContentInvoker(Invoker):
             else:
                 title = os.path.basename(urlparse.urlparse(target.src).path)
 
-            self.palette = ImagePalette(title, target.src, target.ownerDocument)
+            self.palette = ImagePalette(title, target.src,
+                                        target.ownerDocument)
             self.notify_right_click()
         else:
             return
@@ -247,7 +248,7 @@ class ImagePalette(Palette):
         cls = components.classes[ \
                 '@mozilla.org/embedding/browser/nsWebBrowserPersist;1']
         persist = cls.createInstance(interfaces.nsIWebBrowserPersist)
-        persist.persistFlags = 1 # PERSIST_FLAGS_FROM_CACHE
+        persist.persistFlags = 1  # PERSIST_FLAGS_FROM_CACHE
         listener = xpcom.server.WrapObject(_ImageProgressListener(temp_file),
                                            interfaces.nsIWebProgressListener)
         persist.progressListener = listener
@@ -277,8 +278,8 @@ class _ImageProgressListener(object):
         pass
 
     def onStateChange(self, webProgress, request, stateFlags, status):
-        if stateFlags & interfaces.nsIWebProgressListener.STATE_IS_REQUEST and \
-                stateFlags & interfaces.nsIWebProgressListener.STATE_STOP:
+        if (stateFlags & interfaces.nsIWebProgressListener.STATE_IS_REQUEST and
+            stateFlags & interfaces.nsIWebProgressListener.STATE_STOP):
             clipboard = gtk.Clipboard()
             clipboard.set_with_data([('text/uri-list', 0, 0)],
                                     _clipboard_get_func_cb,
diff --git a/places.py b/places.py
index 38fa7b2..d44d747 100644
--- a/places.py
+++ b/places.py
@@ -92,7 +92,7 @@ class SqliteStore(object):
         cursor = self._connection.cursor()
 
         try:
-            cursor.execute('select uri, title, bookmark, gecko_flags,visits, ' \
+            cursor.execute('select uri, title, bookmark, gecko_flags,visits, '
                            'last_visit from places where uri=?', (uri,))
 
             row = cursor.fetchone()
diff --git a/promptservice.py b/promptservice.py
index bab2417..8cdcff9 100644
--- a/promptservice.py
+++ b/promptservice.py
@@ -63,7 +63,8 @@ class PromptService:
         logging.debug('nsIPromptService.select()')
 
 
-#components.registrar.registerFactory(PromptService.cid,
-#                                     PromptService.description,
-#                                     '@mozilla.org/embedcomp/prompt-service;1',
-#                                     Factory(PromptService))
+#components.registrar.registerFactory(
+#    PromptService.cid,
+#    PromptService.description,
+#    '@mozilla.org/embedcomp/prompt-service;1',
+#    Factory(PromptService))
diff --git a/sessionhistory.py b/sessionhistory.py
index 2211551..be4ab93 100644
--- a/sessionhistory.py
+++ b/sessionhistory.py
@@ -29,7 +29,7 @@ class HistoryListener(gobject.GObject):
                                     gobject.TYPE_NONE,
                                     ([int])),
         'session-link-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
-                                    ([str]))
+                                 ([str])),
     }
 
     def __init__(self):
@@ -44,34 +44,34 @@ class HistoryListener(gobject.GObject):
         self._session_history.addSHistoryListener(self._wrapped_self)
 
     def OnHistoryGoBack(self, back_uri):
-        logging.debug("OnHistoryGoBack: %s" % back_uri.spec)
+        logging.debug('OnHistoryGoBack: %s', back_uri.spec)
         self.emit('session-link-changed', back_uri.spec)
         self.emit('session-history-changed', self._session_history.index - 1)
         return True
 
     def OnHistoryGoForward(self, forward_uri):
-        logging.debug("OnHistoryGoForward: %s" % forward_uri.spec)
+        logging.debug('OnHistoryGoForward: %s', forward_uri.spec)
         self.emit('session-link-changed', forward_uri.spec)
         self.emit('session-history-changed', self._session_history.index + 1)
         return True
 
     def OnHistoryGotoIndex(self, index, goto_uri):
-        logging.debug("OnHistoryGotoIndex: %i %s" % (index, goto_uri.spec))
+        logging.debug('OnHistoryGotoIndex: %i %s', index, goto_uri.spec)
         self.emit('session-link-changed', goto_uri.spec)
         self.emit('session-history-changed', index)
         return True
 
     def OnHistoryNewEntry(self, new_uri):
-        logging.debug("OnHistoryNewEntry: %s" % new_uri.spec)
+        logging.debug('OnHistoryNewEntry: %s', new_uri.spec)
         self.emit('session-link-changed', new_uri.spec)
         self.emit('session-history-changed', self._session_history.index + 1)
 
     def OnHistoryPurge(self, num_entries):
-        logging.debug("OnHistoryPurge: %i" % num_entries)
+        logging.debug('OnHistoryPurge: %i', num_entries)
         #self.emit('session-history-changed')
         return True
 
     def OnHistoryReload(self, reload_uri, reload_flags):
         self.emit('session-link-changed', reload_uri.spec)
-        logging.debug("OnHistoryReload: %s" % reload_uri.spec)
+        logging.debug('OnHistoryReload: %s', reload_uri.spec)
         return True
diff --git a/sessionstore.py b/sessionstore.py
index e09c3a1..73edb24 100644
--- a/sessionstore.py
+++ b/sessionstore.py
@@ -41,7 +41,7 @@ def set_session(browser, data):
 
 
 def _get_history(history):
-    logging.debug('%r' % history.count)
+    logging.debug('%r', history.count)
     entries_dest = []
     for i in range(0, history.count):
         entry_orig = history.getEntryAtIndex(i, False)
@@ -60,7 +60,7 @@ def _set_history(history, history_data):
         history_internal.purgeHistory(history_internal.count)
 
     for entry_dict in history_data:
-        logging.debug('entry_dict: %r' % entry_dict)
+        logging.debug('entry_dict: %r', entry_dict)
         entry_class = components.classes[ \
                 "@mozilla.org/browser/session-history-entry;1"]
         entry = entry_class.createInstance(interfaces.nsISHEntry)
diff --git a/webactivity.py b/webactivity.py
index 2e1509d..b444861 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -1,5 +1,6 @@
 # Copyright (C) 2006, Red Hat, Inc.
-# Copyright (C) 2009 Martin Langhoff, Simon Schampijer, Daniel Drake, Tomeu Vizoso
+# Copyright (C) 2009 Martin Langhoff, Simon Schampijer, Daniel Drake,
+#                    Tomeu Vizoso
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -114,17 +115,17 @@ def _seed_xs_cookie():
             _logger.debug('seed_xs_cookie: Cookie exists already')
             return
 
-        expire = int(time.time()) + 10*365*24*60*60
+        expire = int(time.time()) + 10 * 365 * 24 * 60 * 60
         c.execute('''INSERT INTO moz_cookies (name, value, host,
                                               path, expiry, lastAccessed,
                                               isSecure, isHttpOnly)
                      VALUES(?,?,?,?,?,?,?,?)''',
                   ('xoid', cjson.encode(cookie_data), jabber_server,
-                   '/', expire, 0, 0, 0 ))
+                   '/', expire, 0, 0, 0))
         cookies_db.commit()
         cookies_db.close()
-    except sqlite3.Error, e:
-        _logger.error('seed_xs_cookie: %s' % e)
+    except sqlite3.Error:
+        _logger.exception('seed_xs_cookie: could not write cookie')
     else:
         _logger.debug('seed_xs_cookie: Updated cookie successfully')
 
@@ -147,7 +148,7 @@ def _set_accept_languages():
     lang = lang.split('_')
 
     # e.g. es-uy, es
-    pref = lang[0] + "-" + lang[1].lower()  + ", " + lang[0]
+    pref = lang[0] + "-" + lang[1].lower() + ", " + lang[0]
     cls = components.classes["@mozilla.org/preferences-service;1"]
     prefService = cls.getService(components.interfaces.nsIPrefService)
     branch = prefService.getBranch('')
@@ -200,7 +201,7 @@ class WebActivity(activity.Activity):
         # isn't exactly known. Thus, disable the multiple tabs feature
         # if we come across cairo versions >= 1.08.10
         # More information can be found here:
-        # [1] http://lists.sugarlabs.org/archive/sugar-devel/2010-July/025187.html
+        # http://lists.sugarlabs.org/archive/sugar-devel/2010-July/025187.html
         self._disable_multiple_tabs = cairo.cairo_version() >= 10810
         if self._disable_multiple_tabs:
             logging.warning('Not enabling the multiple tabs feature due'
@@ -265,7 +266,7 @@ class WebActivity(activity.Activity):
         self.initiating = None
 
         if self._shared_activity is not None:
-            _logger.debug('shared:  %s' %self._shared_activity.props.joined)
+            _logger.debug('shared: %s', self._shared_activity.props.joined)
 
         if self._shared_activity is not None:
             # We are joining the activity
@@ -286,7 +287,8 @@ class WebActivity(activity.Activity):
         self._setup()
 
         _logger.debug('This is my activity: making a tube...')
-        self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(SERVICE, {})
+        self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(SERVICE,
+                                                                    {})
 
     def _setup(self):
         if self._shared_activity is None:
@@ -304,15 +306,18 @@ class WebActivity(activity.Activity):
             channel = telepathy.client.Channel(bus_name, channel_path)
             htype, handle = channel.GetHandle()
             if htype == telepathy.HANDLE_TYPE_ROOM:
-                _logger.debug('Found our room: it has handle#%d "%s"'
-                    %(handle, self.conn.InspectHandles(htype, [handle])[0]))
+                _logger.debug('Found our room: it has handle#%d "%s"',
+                              handle,
+                              self.conn.InspectHandles(htype, [handle])[0])
                 room = handle
                 ctype = channel.GetChannelType()
                 if ctype == telepathy.CHANNEL_TYPE_TUBES:
-                    _logger.debug('Found our Tubes channel at %s'%channel_path)
+                    _logger.debug('Found our Tubes channel at %s',
+                                  channel_path)
                     tubes_chan = channel
                 elif ctype == telepathy.CHANNEL_TYPE_TEXT:
-                    _logger.debug('Found our Text channel at %s'%channel_path)
+                    _logger.debug('Found our Text channel at %s',
+                                  channel_path)
                     text_chan = channel
 
         if room is None:
@@ -325,9 +330,9 @@ class WebActivity(activity.Activity):
         # Make sure we have a Tubes channel - PS doesn't yet provide one
         if tubes_chan is None:
             _logger.debug("Didn't find our Tubes channel, requesting one...")
-            tubes_chan = self.conn.request_channel(telepathy.CHANNEL_TYPE_TUBES,
-                                                   telepathy.HANDLE_TYPE_ROOM,
-                                                   room, True)
+            tubes_chan = self.conn.request_channel(
+                telepathy.CHANNEL_TYPE_TUBES, telepathy.HANDLE_TYPE_ROOM,
+                room, True)
 
         self.tubes_chan = tubes_chan
         self.text_chan = text_chan
@@ -340,7 +345,7 @@ class WebActivity(activity.Activity):
             self._new_tube_cb(*tube_info)
 
     def _list_tubes_error_cb(self, e):
-        _logger.debug('ListTubes() failed: %s'%e)
+        _logger.debug('ListTubes() failed: %s', e)
 
     def _joined_cb(self, activity_):
         if not self._shared_activity:
@@ -356,10 +361,11 @@ class WebActivity(activity.Activity):
             reply_handler=self._list_tubes_reply_cb,
             error_handler=self._list_tubes_error_cb)
 
-    def _new_tube_cb(self, identifier, initiator, type, service, params, state):
+    def _new_tube_cb(self, identifier, initiator, type, service, params,
+                     state):
         _logger.debug('New tube: ID=%d initator=%d type=%d service=%s '
-                      'params=%r state=%d' %(identifier, initiator, type,
-                                             service, params, state))
+                      'params=%r state=%d', identifier, initiator, type,
+                      service, params, state)
 
         if (type == telepathy.TUBE_TYPE_DBUS and
             service == SERVICE):
@@ -369,7 +375,7 @@ class WebActivity(activity.Activity):
 
             self.tube_conn = TubeConnection(self.conn,
                 self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES],
-                identifier, group_iface = self.text_chan[
+                identifier, group_iface=self.text_chan[
                     telepathy.CHANNEL_INTERFACE_GROUP])
 
             _logger.debug('Tube created')
@@ -412,7 +418,7 @@ class WebActivity(activity.Activity):
                                       base64.b64decode(link['thumb']),
                                       link['color'], link['title'],
                                       link['owner'], -1, link['hash'])
-            logging.debug('########## reading %s' % data)
+            logging.debug('########## reading %s', data)
             self._tabbed_view.set_session(self.model.data['history'])
             self._tabbed_view.set_current_page(self.model.data['current_tab'])
         elif self.metadata['mime_type'] == 'text/uri-list':
@@ -452,18 +458,21 @@ class WebActivity(activity.Activity):
                     self.metadata['title'] = browser.props.title
 
             self.model.data['history'] = self._tabbed_view.get_session()
-            self.model.data['current_tab'] = self._tabbed_view.get_current_page()
+            current_tab = self._tabbed_view.get_current_page()
+            self.model.data['current_tab'] = current_tab
 
             self.model.data['currents'] = []
             for n in range(0, self._tabbed_view.get_n_pages()):
                 n_browser = self._tabbed_view.get_nth_page(n)
                 if n_browser != None:
-                    ui_uri = browser.get_url_from_nsiuri(browser.progress.location)
-                    self.model.data['currents'].append({'title':browser.props.title,'url':ui_uri})
+                    nsiuri = browser.progress.location
+                    ui_uri = browser.get_url_from_nsiuri(nsiuri)
+                    info = {'title': browser.props.title, 'url': ui_uri}
+                    self.model.data['currents'].append(info)
 
             f = open(file_path, 'w')
             try:
-                logging.debug('########## writing %s' % self.model.serialize())
+                logging.debug('########## writing %s', self.model.serialize())
                 f.write(self.model.serialize())
             finally:
                 f.close()
@@ -520,8 +529,8 @@ class WebActivity(activity.Activity):
 
         for link in self.model.data['shared_links']:
             if link['hash'] == sha1(ui_uri).hexdigest():
-                _logger.debug('_add_link: link exist already a=%s b=%s' %(
-                    link['hash'], sha1(ui_uri).hexdigest()))
+                _logger.debug('_add_link: link exist already a=%s b=%s',
+                              link['hash'], sha1(ui_uri).hexdigest())
                 return
         buf = self._get_screenshot()
         timestamp = time.time()
@@ -547,7 +556,8 @@ class WebActivity(activity.Activity):
         item = LinkButton(url, buf, color, title, owner, index, hash)
         item.connect('clicked', self._link_clicked_cb, url)
         item.connect('remove_link', self._link_removed_cb)
-        self._tray.add_item(item, index) # use index to add to the tray
+        # use index to add to the tray
+        self._tray.add_item(item, index)
         item.show()
         if self._tray.props.visible is False:
             self._tray.show()
@@ -598,9 +608,9 @@ class WebActivity(activity.Activity):
             alert.props.title = _('Download in progress')
             alert.props.msg = _('Stopping now will cancel your download')
             cancel_icon = Icon(icon_name='dialog-cancel')
-            alert.add_button(gtk.RESPONSE_CANCEL, _('Continue Download'), cancel_icon)
+            alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel'), cancel_icon)
             stop_icon = Icon(icon_name='dialog-ok')
-            alert.add_button(gtk.RESPONSE_OK, _('Cancel Download'), stop_icon)
+            alert.add_button(gtk.RESPONSE_OK, _('Stop'), stop_icon)
             stop_icon.show()
             self.add_alert(alert)
             alert.connect('response', self.__inprogress_response_cb)
diff --git a/webtoolbar.py b/webtoolbar.py
index a5e2c6e..937136c 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -37,6 +37,7 @@ import places
 
 _MAX_HISTORY_ENTRIES = 15
 
+
 class WebEntry(AddressEntry):
     _COL_ADDRESS = 0
     _COL_TITLE = 1
@@ -216,6 +217,7 @@ class WebEntry(AddressEntry):
         else:
             self._search_popup()
 
+
 class PrimaryToolbar(ToolbarBox):
     __gtype_name__ = 'PrimaryToolbar'
 
@@ -228,7 +230,7 @@ class PrimaryToolbar(ToolbarBox):
                      ([])),
         'go-home': (gobject.SIGNAL_RUN_FIRST,
                      gobject.TYPE_NONE,
-                     ([]))
+                     ([])),
     }
 
     def __init__(self, tabbed_view, act, disable_multiple_tabs):
@@ -408,7 +410,6 @@ class PrimaryToolbar(ToolbarBox):
 
     def _go_home_cb(self, button):
         self.emit('go-home')
-        self._activity.load_homepage()
 
     def _go_back_cb(self, button):
         browser = self._tabbed_view.props.current_browser