Merge lp:~robin-gloster/ubuntu-accomplishments-viewer/pep8 into lp:ubuntu-accomplishments-viewer

[Robin Gloster]

Fixed most pep8 issues

[Matt Fischer (mfisch)]

Here's a diff with all whitespace changes removed:

http://paste.ubuntu.com/1390196/

[Matt Fischer (mfisch)]

Looks fine to me, but Cielak should also look, also what testing did you do?

review: Approve

[Robin Gloster (robin-gloster)]

Visited all pages and changed everything in the viewer i could find and
think of.
From what I could tell it should work exactly as before except for the k ->
kid fix which should have killed the viewer before.

2012/11/26 Matt Fischer <email address hidden>

> Review: Approve
>
> Looks fine to me, but Cielak should also look, also what testing did you
> do?
> --
>
> https://code.launchpad.net/~robin-gloster/ubuntu-accomplishments-viewer/pep8/+merge/136211
> You are the owner of lp:~robin-gloster/ubuntu-accomplishments-viewer/pep8.
>

[Rafał Cieślak (rafalcieslak256)]

I have carefully reviewed these changes, and they seem perfectly fine. I have also did a bunch of tests for the viewer, and as expected - nothing suspicious could be detected. Thanks Robin for these fixes!

review: Approve

[lp:~robin-gloster/ubuntu-accomplishments-viewer/pep8]

221. By Rafał Cieślak on 2012-11-28

Merging in the branch that introduces use of GtkInfoBars for notifications

222. By Rafał Cieślak on 2012-11-28

Fixed #1084058.

[Matt Fischer (mfisch)]

Rafal,

Are you going to merge this?

[lp:~robin-gloster/ubuntu-accomplishments-viewer/pep8]

223. By Rafał Cieślak on 2012-11-28

Merged in Robin's PEP fixes

[Rafał Cieślak (rafalcieslak256)]

Just merged it in.

=== modified file 'Changelog'
--- Changelog	2012-11-22 10:45:38 +0000
+++ Changelog	2012-11-26 16:03:25 +0000
@@ -6,7 +6,7 @@
 Add items using the following format:
 
    [Name]
-   * What you did 
+   * What you did
    * If a bug (LP: #BUGNUMBER)
 
    For example:
@@ -30,4 +30,6 @@
    * Fix lintian issues
    * Added a manpage (LP: #1069264)
 
+   [Robin Gloster]
+   * Fixed most PEP8 issues
 -------------------------------------------------------------------------

=== modified file 'accomplishments_viewer/AboutAccomplishmentsViewerDialog.py'
--- accomplishments_viewer/AboutAccomplishmentsViewerDialog.py	2012-09-13 19:19:11 +0000
+++ accomplishments_viewer/AboutAccomplishmentsViewerDialog.py	2012-11-26 16:03:25 +0000
@@ -1,24 +1,25 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
-import gettext, locale
+import gettext
+import locale
 from locale import gettext as _
 from accomplishments.util.paths import locale_dir
 locale.bindtextdomain('accomplishments-viewer', locale_dir)
-gettext.bindtextdomain('accomplishments-viewer',locale_dir)
+gettext.bindtextdomain('accomplishments-viewer', locale_dir)
 locale.textdomain('accomplishments-viewer')
 
 from accomplishments.daemon import dbusapi
@@ -28,11 +29,12 @@
 
 from accomplishments_viewer_lib.AboutDialog import AboutDialog
 
+
 # See accomplishments_viewer_lib.AboutDialog.py for more details about how this class works.
 class AboutAccomplishmentsViewerDialog(AboutDialog):
     __gtype_name__ = "AboutAccomplishmentsViewerDialog"
-    
-    def finish_initializing(self, builder): # pylint: disable=E1002
+
+    def finish_initializing(self, builder):  # pylint: disable=E1002
         """Set up the about dialog"""
         super(AboutAccomplishmentsViewerDialog, self).finish_initializing(builder)
 
@@ -41,17 +43,17 @@
         self.libaccom = dbusapi.Accomplishments()
 
         # add app authors
-        authors = sorted([ "Jono Bacon <[e-mail]>", "Rafal Cieślak <[e-mail]>", "Matt Fischer <[e-mail]>", "Stuart Langridge <[e-mail]>"])
-        
+        authors = sorted(["Jono Bacon <[e-mail]>", "Rafal Cieślak <[e-mail]>", "Matt Fischer <[e-mail]>", "Stuart Langridge <[e-mail]>"])
+
         for col in self.libaccom.list_collections():
             authors.append(" ")
             authors.append("'" + self.libaccom.get_collection_name(col) + "' " + _("Collection Authors:"))
             authors.append(" ")
-            
+
             tempauthors = []
             for a in self.libaccom.get_collection_authors(col):
                 tempauthors.append(a)
 
             authors = authors + sorted(tempauthors)
-            
+
         self.set_authors(authors)

=== modified file 'accomplishments_viewer/AccomplishmentsViewerWindow.py'
--- accomplishments_viewer/AccomplishmentsViewerWindow.py	2012-11-22 10:04:35 +0000
+++ accomplishments_viewer/AccomplishmentsViewerWindow.py	2012-11-26 16:03:25 +0000
@@ -1,25 +1,27 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 import urllib2
-import gettext, locale, datetime
+import gettext
+import locale
+import datetime
 from locale import gettext as _
 from accomplishments.util.paths import locale_dir
 locale.bindtextdomain('accomplishments-viewer', locale_dir)
-gettext.bindtextdomain('accomplishments-viewer',locale_dir)
+gettext.bindtextdomain('accomplishments-viewer', locale_dir)
 locale.textdomain('accomplishments-viewer')
 
 import traceback
@@ -32,7 +34,7 @@
 import dbus.service
 from dbus.mainloop.glib import DBusGMainLoop
 
-from gi.repository import Gtk, GObject, GdkPixbuf, WebKit # pylint: disable=E0611
+from gi.repository import Gtk, GObject, GdkPixbuf, WebKit  # pylint: disable=E0611
 from gi.repository import Unity
 
 import logging
@@ -96,23 +98,24 @@
 
 TROPHY_GALLERY_URL = 'http://213.138.100.229:8000'
 
+
 # See accomplishments_viewer_lib.Window.py for more details about how this class works
 class AccomplishmentsViewerWindow(Window):
     __gtype_name__ = "AccomplishmentsViewerWindow"
-    
-    def finish_initializing(self, builder): # pylint: disable=E1002
+
+    def finish_initializing(self, builder):  # pylint: disable=E1002
         """Set up the main window."""
-        
+
         super(AccomplishmentsViewerWindow, self).finish_initializing(builder)
 
         self.AboutDialog = AboutAccomplishmentsViewerDialog
-        self.PreferencesDialog = PreferencesAccomplishmentsViewerDialog #class
-        self.preferences_dialog = None #instance
+        self.PreferencesDialog = PreferencesAccomplishmentsViewerDialog  # class
+        self.preferences_dialog = None  # instance
         self.EditExtraDialog = EditExtrainfoDialog()
         self.EditExtraDialog.parent = self
         self.curr_height = 0
         self.curr_width = 0
-        
+
         # Following variables store current display settings.
         self.display_mytrophies_filtermode = MYTROPHIES_FILTER_ALL
         self.display_mode = DISPLAY_MODE_OPPORTUNITIES
@@ -121,13 +124,12 @@
         self.display_filter_category = ""
         self.display_filter_subcat = ""
         self.display_filter_search = ""
-        
+
         # These two store list of pairs [filter, iconview] for all accomplishment groups in mytrophies view.
         self.trophies_collection_filters = []
         self.mytrophies_latest_boxes = []
         # Code for other initialization actions should be added here.
 
-        
         # set up autostart dir
         self.autostartdir = None
 
@@ -144,7 +146,7 @@
         # reference to the Unity Launchcher
         self.launcher = Unity.LauncherEntry.get_for_desktop_id("accomplishments-viewer.desktop")
         self.newtrophies = 0
-        
+
         # set up all of the different UI references
         self.tb_mytrophies = self.builder.get_object("tb_mytrophies")
         self.tb_opportunities = self.builder.get_object("tb_opportunities")
@@ -192,38 +194,38 @@
         sb_v = self.subcats_scroll.get_vscrollbar()
         sb_h.set_child_visible(False)
         sb_v.set_child_visible(False)
-                
+
         #h = self.subcats_scroll.get_hadjustment()
         self.subcat = None
         self.subcats_container.hide()
-        
+
         # make the toolbar black in Ubuntu
         context = self.toolbar.get_style_context()
         context.add_class(Gtk.STYLE_CLASS_PRIMARY_TOOLBAR)
 
         # Create stores and corelated filters
 
-        self.oppstore = Gtk.ListStore(str, GdkPixbuf.Pixbuf, bool, bool, str, str, str, str, str) # title, icon, accomplished, locked, col, accomplishment, date-accomplished, categories, keywords
+        self.oppstore = Gtk.ListStore(str, GdkPixbuf.Pixbuf, bool, bool, str, str, str, str, str)  # title, icon, accomplished, locked, col, accomplishment, date-accomplished, categories, keywords
         self.oppstore.set_sort_column_id(COL_TITLE, Gtk.SortType.ASCENDING)
         self.oppstore_filtered = self.oppstore.filter_new()
         # The following sets the function for tree model filter. That function has
         # to return true if a given row has to be visible. This way we can control
         # which opportunities are displayed, and which are not.
         self.oppstore_filtered.set_visible_func(self._opp_visible_func)
-            
-        self.trophiesstore = Gtk.ListStore(str, GdkPixbuf.Pixbuf, bool, bool, str, str, str, str, str) # title, icon, accomplished, locked, col, accomplishment, date-accomplished, categories, keywords
+
+        self.trophiesstore = Gtk.ListStore(str, GdkPixbuf.Pixbuf, bool, bool, str, str, str, str, str)  # title, icon, accomplished, locked, col, accomplishment, date-accomplished, categories, keywords
         self.trophiesstore.set_sort_column_id(COL_TITLE, Gtk.SortType.ASCENDING)
         self.trophiesstore_filter_today = self.trophiesstore.filter_new()
-        self.trophiesstore_filter_today.set_visible_func(self._trophy_recent_visible_func,TROPHIES_FILTER_TODAY)
+        self.trophiesstore_filter_today.set_visible_func(self._trophy_recent_visible_func, TROPHIES_FILTER_TODAY)
         self.trophiesstore_filter_week = self.trophiesstore.filter_new()
-        self.trophiesstore_filter_week.set_visible_func(self._trophy_recent_visible_func,TROPHIES_FILTER_WEEK)
+        self.trophiesstore_filter_week.set_visible_func(self._trophy_recent_visible_func, TROPHIES_FILTER_WEEK)
         self.trophiesstore_filter_month = self.trophiesstore.filter_new()
-        self.trophiesstore_filter_month.set_visible_func(self._trophy_recent_visible_func,TROPHIES_FILTER_MONTH)
+        self.trophiesstore_filter_month.set_visible_func(self._trophy_recent_visible_func, TROPHIES_FILTER_MONTH)
         self.trophiesstore_filter_sixmonths = self.trophiesstore.filter_new()
-        self.trophiesstore_filter_sixmonths.set_visible_func(self._trophy_recent_visible_func,TROPHIES_FILTER_SIXMONTHS)
+        self.trophiesstore_filter_sixmonths.set_visible_func(self._trophy_recent_visible_func, TROPHIES_FILTER_SIXMONTHS)
         self.trophiesstore_filter_earlier = self.trophiesstore.filter_new()
-        self.trophiesstore_filter_earlier.set_visible_func(self._trophy_recent_visible_func,TROPHIES_FILTER_EARLIER)
-        
+        self.trophiesstore_filter_earlier.set_visible_func(self._trophy_recent_visible_func, TROPHIES_FILTER_EARLIER)
+
         self.opp_icon.set_model(self.oppstore_filtered)
         self.opp_icon.set_text_column(COL_TITLE)
         self.opp_icon.set_pixbuf_column(COL_PIXBUF)
@@ -232,13 +234,13 @@
         self.webview = WebKit.WebView()
         self.scrolledwindow.add(self.webview)
         self.webview.props.settings.props.enable_default_context_menu = False
-        self.webkitlink = self.webview.connect("navigation-policy-decision-requested",self.webkit_link_clicked)
+        self.webkitlink = self.webview.connect("navigation-policy-decision-requested", self.webkit_link_clicked)
 
         self.webview.show()
-        
+
         if GWIBBER_OK:
-            self.messageentry = GwibberGtk.Entry()        
-            self.messageentry.text_view.connect("submit",self.close_gwibber_window)
+            self.messageentry = GwibberGtk.Entry()
+            self.messageentry.text_view.connect("submit", self.close_gwibber_window)
             self.messagewindow = Gtk.Window()
             self.messagewindow.set_transient_for(self)
             self.messagevbox = Gtk.VBox()
@@ -246,15 +248,15 @@
             self.messagewindow.set_icon_name("gwibber")
             self.messagewindow.resize(400, 150)
             self.messagewindow.set_resizable(False)
-            self.messagevbox.pack_start(self.messageentry,True,True,0)
+            self.messagevbox.pack_start(self.messageentry, True, True, 0)
             self.messagelabel = Gtk.Label()
             self.messagelabel.set_markup(_("<b>Always add the link to your trophy on the web when sharing a trophy.</b>\nThis link works as a <b>proof</b> that you have really accomplished this trophy."))
-            self.messagevbox.pack_start(self.messagelabel,False,False,0)
+            self.messagevbox.pack_start(self.messagelabel, False, False, 0)
             self.messagewindow.add(self.messagevbox)
-            self.messagevbox.show_all()   
+            self.messagevbox.show_all()
             self.messagewindow.hide()
-            self.messagewindow.connect("delete-event",self.close_gwibber_window)
-            
+            self.messagewindow.connect("delete-event", self.close_gwibber_window)
+
         self.opp_col_store = Gtk.ListStore(str, str)
         self.col_combo_renderer_text = Gtk.CellRendererText()
         self.opp_combo_col.pack_start(self.col_combo_renderer_text, True)
@@ -291,26 +293,23 @@
             os.makedirs(os.path.join(self.dir_cache, "logs"))
 
         # IMPORTANT: This function should do no initialisations that depend
-        # on having the daemon running. This is because if the daemon is not 
-        # yet started it will take some time to connect to it. Such 
+        # on having the daemon running. This is because if the daemon is not
+        # yet started it will take some time to connect to it. Such
         # initialistions should land in appropriate place in finalise_daemon_connection(...).
 
         self.datapath = get_data_path()
 
         self.update_widgets_sensitivity()
 
-        
-
     def add_no_collections_installed(self):
         """Display the message that no collections are installed."""
-        
+
         ### Commented out the following as it is confusing, and opens a lot of
         ### possible scenarios where these buttons are left insensitive.
         ## set bits of the user interface to be insensitive
         # self.tb_mytrophies.set_sensitive(False)
         # self.opp_frame.set_visible(False)
-        
-        
+
         # show the message
         self.additional_no_collections.set_visible(True)
 
@@ -322,28 +321,28 @@
         self.additional_no_collections.set_visible(False)
         self.reload_accomplishments()
         self.set_display(DISPLAY_MODE_OPPORTUNITIES)
-        
+
     def reload_accomplishments(self):
         if not self.connected:
             return
-            
+
         self.statusbar_reload_msg_start()
-        Gtk.main_iteration_do(False) # Force UI refresh
+        Gtk.main_iteration_do(False)  # Force UI refresh
         self.libaccom.reload_accom_database()
         self.statusbar_reload_msg_stop()
-        
+
         self._load_accomplishments()
         if len(self.accomdb) == 0:
             self.add_no_collections_installed()
-            
+
     def statusbar_reload_msg_start(self):
         self.statusbar.set_text(_("Reloading accomplishments collections..."))
         self.spinner.start()
         self.spinner.show()
         self.statusbox.show()
         self.statusbar_reload_msg = 0
-        GObject.timeout_add(1000,self.statusbar_reload_msg_stop)
-    
+        GObject.timeout_add(1000, self.statusbar_reload_msg_stop)
+
     def statusbar_reload_msg_stop(self):
         if self.statusbar_reload_msg is 0:
             # That would be too quick and the user wouldn't even notice the message
@@ -351,23 +350,22 @@
         elif self.statusbar_reload_msg is 1:
             self.spinner.hide()
             self.statusbox.hide()
-            
-    
+
     def trophy_received(self, message):
         """Called when a new trophy is detected on the system."""
-        
+
         self.newtrophies = self.newtrophies + 1
-        
+
         # run this to refresh our accomplishments list
         self._load_accomplishments()
-        
+
         #XXX: It would be MUCH faster if we determined the new accomID and added just it, not recreating whole trees!
         self.prepare_models()
-        
+
         # set the Launcher icon to be urgent and show new trophy count
         self.launcher.set_property("urgent", True)
         self.launcher.set_property("count", self.newtrophies)
-        
+
         if self.newtrophies > 0:
             self.launcher.set_property("count_visible", True)
         else:
@@ -379,10 +377,10 @@
     def check_and_ask_for_info(self):
         """Asks the daemon for additional info needed, and asks
            the user for it, in case it has not been yet given"""
-        
+
         if self.connected is False:
             return
-    
+
         self.has_u1 = self.libaccom.get_config_value("config", "has_u1")
         self.has_verif = self.libaccom.get_config_value("config", "has_verif")
 
@@ -397,90 +395,90 @@
 
     def connect_to_daemon(self):
         """Tries to connect to the daemon"""
-        
+
         self.connected = False
-        
+
         if dbusapi.daemon_is_registered():
             self.libaccom = dbusapi.Accomplishments()
         else:
             return False
-                
+
         dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
         bus = dbus.SessionBus()
-        
+
         try:
-            object  = bus.get_object("org.ubuntu.accomplishments",
-                "/org/ubuntu/accomplishments")
+            object = bus.get_object("org.ubuntu.accomplishments",
+                                    "/org/ubuntu/accomplishments")
             object.connect_to_signal("trophy_recieved",
-                self.trophy_received,
-                dbus_interface="org.ubuntu.accomplishments", arg0="Hello")
+                                     self.trophy_received,
+                                     dbus_interface="org.ubuntu.accomplishments", arg0="Hello")
             object.connect_to_signal("publish_trophies_online_completed",
-                self.publish_trophies_online_completed,
-                dbus_interface="org.ubuntu.accomplishments", arg0="Hello")                
+                                     self.publish_trophies_online_completed,
+                                     dbus_interface="org.ubuntu.accomplishments", arg0="Hello")
             object.connect_to_signal("scriptrunner_start",
-                self.scriptrunner_start,
-                dbus_interface="org.ubuntu.accomplishments")
+                                     self.scriptrunner_start,
+                                     dbus_interface="org.ubuntu.accomplishments")
             object.connect_to_signal("scriptrunner_finish",
-                self.scriptrunner_finish,
-                dbus_interface="org.ubuntu.accomplishments")
+                                     self.scriptrunner_finish,
+                                     dbus_interface="org.ubuntu.accomplishments")
             object.connect_to_signal("ubuntu_one_account_ready",
-                self.ubuntu_one_account_ready,
-                dbus_interface="org.ubuntu.accomplishments", arg0="Hello")
-        
+                                     self.ubuntu_one_account_ready,
+                                     dbus_interface="org.ubuntu.accomplishments", arg0="Hello")
+
         except dbus.DBusException:
             print "DBus exception when connecting to daemon."
             traceback.print_exc()
             return False
 
         bus.add_signal_receiver(self.trophy_received,
-            dbus_interface = "org.ubuntu.accomplishments",
-            signal_name = "trophy_received")
+                                dbus_interface="org.ubuntu.accomplishments",
+                                signal_name="trophy_received")
         bus.add_signal_receiver(self.publish_trophies_online_completed,
-            dbus_interface = "org.ubuntu.accomplishments",
-            signal_name = "publish_trophies_online_completed")
+                                dbus_interface="org.ubuntu.accomplishments",
+                                signal_name="publish_trophies_online_completed")
         bus.add_signal_receiver(self.scriptrunner_start,
-            dbus_interface = "org.ubuntu.accomplishments",
-            signal_name = "scriptrunner_start")
+                                dbus_interface="org.ubuntu.accomplishments",
+                                signal_name="scriptrunner_start")
         bus.add_signal_receiver(self.scriptrunner_finish,
-            dbus_interface = "org.ubuntu.accomplishments",
-            signal_name = "scriptrunner_finish")
+                                dbus_interface="org.ubuntu.accomplishments",
+                                signal_name="scriptrunner_finish")
         bus.add_signal_receiver(self.ubuntu_one_account_ready,
-            dbus_interface = "org.ubuntu.accomplishments",
-            signal_name = "ubuntu_one_account_ready")
-        
+                                dbus_interface="org.ubuntu.accomplishments",
+                                signal_name="ubuntu_one_account_ready")
+
         self.connected = True
-        
+
         self.check_daemon_session()
-        
+
         return True
 
     def publish_trophies_online_completed(self, url):
         webbrowser.open(url)
 
-    def ubuntu_one_account_ready(self):        
+    def ubuntu_one_account_ready(self):
         if not self.has_u1 == 1:
             self.register_with_verif(None)
-        
+
     def run_daemon(self):
-        """Starts the daemon process"""                
-	
-		# Not importing this globally, as it will be very rarely used.
-		import subprocess
-		import threading
-		
-		# Starting the daemon is realised in a separete thread, it can
-		# wait for launcher to exit without blocking gtk main event loop.
-		def run_in_thread_and_call_when_done(args,onexit):
-			launcher_process = subprocess.Popen(args.split(" "))
-			launcher_process.wait()
-			GObject.idle_add(onexit)
-			return
+        """Starts the daemon process"""
+
+        # Not importing this globally, as it will be very rarely used.
+        import subprocess
+        import threading
+
+        # Starting the daemon is realised in a separete thread, it can
+        # wait for launcher to exit without blocking gtk main event loop.
+        def run_in_thread_and_call_when_done(args, onexit):
+            launcher_process = subprocess.Popen(args.split(" "))
+            launcher_process.wait()
+            GObject.idle_add(onexit)
+            return
         command = os.path.join(daemon_exec_dir, "accomplishments-daemon") + " --start"
         print ("Starting the daemon using command `%s`" % command)
-        th = threading.Thread(target=run_in_thread_and_call_when_done,args=(command, self.run_daemon_continue))
+        th = threading.Thread(target=run_in_thread_and_call_when_done, args=(command, self.run_daemon_continue))
         th.start()
-        
+
         self.statusbar.set_text(_("Starting the daemon..."))
         self.spinner.start()
         self.spinner.show()
@@ -489,26 +487,26 @@
     def run_daemon_continue(self):
         """Called from run_daemon when the daemon launcher exits.
            Finishes what run_daemon would do"""
-    
+
         self.connect_to_daemon()
-        
+
         self.statusbox.hide()
-        
+
         if self.connected is False:
             #Either failed to start the daemon, or failed to connect to
             #It may either be not installed, or may have crashed on startup
             self.statusbar.set_text("Failed to connect to the daemon.")
             self.spinner.hide()
             self.statusbox.show()
-            GObject.timeout_add(10000,self.run_daemon)
+            GObject.timeout_add(10000, self.run_daemon)
         else:
             #successfully started and connected
             self.finalise_daemon_connection()
-            
+
         self.update_widgets_sensitivity()
-        
+
         #returning false removes the timeout
-        return False    
+        return False
 
     def finalise_daemon_connection(self):
         self.libaccom.create_all_trophy_icons()
@@ -518,7 +516,6 @@
         if len(self.accomdb) == 0:
             self.add_no_collections_installed()
         self.set_display(DISPLAY_MODE_OPPORTUNITIES)
-        
 
     def update_widgets_sensitivity(self):
         """Disables/enables some GUI elemets, according to whether the client is connected to the daemon or nor"""
@@ -532,7 +529,7 @@
             self.mnu_edit_ident.set_sensitive(False)
         return
 
-    def edit_identification_clicked(self,w):
+    def edit_identification_clicked(self, w):
         """Called when user clicks Edit->Identification..."""
         if self.connected is False:
             return
@@ -544,9 +541,9 @@
             pass
 
         self.EditExtraDialog.prepare(self.libaccom)
-        result = self.EditExtraDialog.run() #the dialog's response handlers will take care about storing the result
+        result = self.EditExtraDialog.run()  # the dialog's response handlers will take care about storing the result
         self.EditExtraDialog.hide()
-        
+
         # re-load accoms and show the opps view, which will update both views
         # XXX we should probably do this inside EditExtraInfoDialog.py
         self._load_accomplishments()
@@ -558,7 +555,7 @@
         self.subcats_forward.set_sensitive(True)
 
     def subcat_clicked(self, button, data):
-        self.set_display(filter_subcat = data)
+        self.set_display(filter_subcat=data)
 
     def subcats_back_button(self, widget):
         h = self.subcats_scroll.get_hadjustment()
@@ -572,33 +569,33 @@
         h.set_value(new)
         self.subcats_scroll.set_hadjustment(h)
 
-    def show_gwibber_widget(self,accomID,name):
+    def show_gwibber_widget(self, accomID, name):
         if GWIBBER_OK:
             # Temporarily using trophies.ubuntu.com
             #trophyURL = TROPHY_GALLERY_URL+'/gallery/trophies/'+name+'/'+accomID
-            trophyURL = 'http://trophies.ubuntu.com/gallery/trophies/'+name+'/'+accomID
-            trophy_name = self.libaccom.get_accom_title(accomID);
+            trophyURL = 'http://trophies.ubuntu.com/gallery/trophies/' + name + '/' + accomID
+            trophy_name = self.libaccom.get_accom_title(accomID)
             self.messageentry.text_view.get_buffer().set_text(_("I've just got the trophy '%s' in #ubuntu accomplishments!") % (trophy_name))
             self.messagewindow.show()
             self.messagewindow.present()
 
-    def close_gwibber_window(self,widget=None,event=None):
+    def close_gwibber_window(self, widget=None, event=None):
         self.messagewindow.hide()
         return True
-    
+
     def webkit_link_clicked(self, view, frame, net_req, nav_act, pol_dec):
         """Load a link from the webkit view in an external system browser."""
 
-        uri=net_req.get_uri()
-        if uri.startswith ('file:///gwibber-share'):
+        uri = net_req.get_uri()
+        if uri.startswith('file:///gwibber-share'):
             if GWIBBER_OK:
                 share_name = self.libaccom.get_share_name()
                 share_name = urllib2.quote(share_name.encode('utf8'))
                 share_ID = self.libaccom.get_share_id()
-                nameURL = TROPHY_GALLERY_URL+"/user/getusername?share_name="+share_name+"&share_id="+share_ID
+                nameURL = TROPHY_GALLERY_URL + "/user/getusername?share_name=" + share_name + "&share_id=" + share_ID
 
                 publish_status = self.libaccom.get_published_status()
-                if publish_status==0:
+                if publish_status == 0:
                     dialog = Gtk.MessageDialog(self, Gtk.DialogFlags.MODAL, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, _("Your trophies are not yet published"))
                     dialog.format_secondary_text(_("You can do it from Edit->Preferences menu."))
                     dialog.run()
@@ -608,9 +605,9 @@
                         response = urllib2.urlopen(nameURL)
                         for line in response:
                             name = line.rstrip()
-                            break          
-                        uri = uri.replace("file:///gwibber-share?accomID=", '');
-                        gwibberPopup = self.show_gwibber_widget(uri,name)
+                            break
+                        uri = uri.replace("file:///gwibber-share?accomID=", '')
+                        gwibberPopup = self.show_gwibber_widget(uri, name)
                     except urllib2.HTTPError:
                         print 'HTTPError while getting username.'
                 return True
@@ -621,23 +618,23 @@
             return False
 
         if uri.startswith('file:'):
-            return False            
-            
+            return False
+
         if uri.startswith('http'):
             webbrowser.open_new_tab(uri)
             return True
 
         if uri.startswith('accomplishment:'):
             id = uri[17:]
-            self.set_display(DISPLAY_MODE_DETAILS,accomID=id)
+            self.set_display(DISPLAY_MODE_DETAILS, accomID=id)
             return True
 
         pol_dec.ignore()
-        return True        
+        return True
 
     def scriptrunner_start(self):
         """Indicate that the script runner is starting."""
-        
+
         self.statusbar.set_text("Checking for new accomplishments...")
         self.spinner.start()
         self.spinner.show()
@@ -645,7 +642,7 @@
 
     def scriptrunner_finish(self):
         """Indicate that the script runner has stopped."""
-        
+
         self.statusbar.set_text("")
         self.spinner.stop()
         self.spinner.hide()
@@ -663,7 +660,7 @@
     def verify_u1_account(self):
         ver = self.libaccom.verify_ubuntu_one_account()
 
-        if bool(ver) == True:
+        if bool(ver) is True:
             self.u1_button.disconnect(self.u1_button_sig)
             self.u1_button.set_label("Click here to confirm your Ubuntu One account")
             self.u1_button_sig = self.u1_button.connect("clicked", self.register_with_verif)
@@ -694,7 +691,7 @@
     def complete_share_process(self):
         self.has_u1 = True
         self.libaccom.write_config_file_item("config", "has_u1", True)
-        
+
         self.additional_ubuntu1.set_visible(False)
 
         # ACCOMPLISHMENT: Editing Credentials
@@ -702,7 +699,7 @@
             self.libaccom.accomplish("ubuntu-desktop/accomplishments-shared-with-validation-server")
         except:
             pass
-        
+
         self.check_for_extra_info_required()
 
     def register_with_verif(self, widget):
@@ -716,20 +713,20 @@
         self.u1_button.show()
         self.additional_ubuntu1.set_visible(True)
 
-    def on_window_resized(self,widget):
-		# Workaround for GtkIconView bug in precise
-		if self.display_mode is DISPLAY_MODE_OPPORTUNITIES:
-			self._update_opportunities_view()
-		elif self.display_mode is DISPLAY_MODE_TROPHIES:
-			self._update_mytrophy_view()
-        
+    def on_window_resized(self, widget):
+        # Workaround for GtkIconView bug in precise
+        if self.display_mode is DISPLAY_MODE_OPPORTUNITIES:
+            self._update_opportunities_view()
+        elif self.display_mode is DISPLAY_MODE_TROPHIES:
+            self._update_mytrophy_view()
+
     def populate_opp_combos(self):
         temp = []
         for i in self.accomdb:
-            temp.append({i["collection"] : i["collection-human"] })
+            temp.append({i["collection"]: i["collection-human"]})
         # uniqify the values
         result = [dict(tupleized) for tupleized in set(tuple(item.items()) for item in temp)]
-        
+
         # set up app
         self.opp_col_store.append(["", "All"])
         for i in sorted(result):
@@ -741,73 +738,73 @@
         # Prepare categories combo
         self.opp_combo_cat.set_model(self.opp_cat_store)
         self.opp_combo_cat.show()
-      
-    def on_filter_collection_changed(self,widget):
+
+    def on_filter_collection_changed(self, widget):
         tree_iter = widget.get_active_iter()
         model = widget.get_model()
         collection, name = model[tree_iter][:2]
-        self.set_display(filter_collection = collection)
+        self.set_display(filter_collection=collection)
 
     def on_filter_category_changed(self, widget):
         tree_iter = widget.get_active_iter()
-        if tree_iter == None: # Special case if the categories combo is not sensitive
+        if tree_iter is None:  # Special case if the categories combo is not sensitive
             return
         model = widget.get_model()
         category, name = model[tree_iter][:2]
-        self.set_display(filter_category = category)
-    
+        self.set_display(filter_category=category)
+
     def on_filter_show_locked_clicked(self, widget):
-		if widget.get_active():
-			self.set_display(filter_locked=DISPLAY_FILTER_LOCKED_SHOW)
-		else:
-			self.set_display(filter_locked=DISPLAY_FILTER_LOCKED_HIDE)
-    
-    def on_search_changed(self,widget):
-		value = widget.get_text()
-		self.set_display(search_query=value)
-
-    def on_search_clear_clicked(self,widget,icon,data):
+        if widget.get_active():
+            self.set_display(filter_locked=DISPLAY_FILTER_LOCKED_SHOW)
+        else:
+            self.set_display(filter_locked=DISPLAY_FILTER_LOCKED_HIDE)
+
+    def on_search_changed(self, widget):
+        value = widget.get_text()
+        self.set_display(search_query=value)
+
+    def on_search_clear_clicked(self, widget, icon, data):
         self.searchbar.set_text("")
-    
+
     def check_accomplishments(self, widget):
         """Called when Check Accomplishments is selected in the interface."""
         self.libaccom.run_scripts(True)
-        
+
     def on_mytrophies_filter_latest_toggled(self, widget):
-		self.set_display(trophies_mode=MYTROPHIES_FILTER_LATEST)
+        self.set_display(trophies_mode=MYTROPHIES_FILTER_LATEST)
 
-    def on_mytrophies_filter_all_toggled(self, widget):   
-		self.set_display(trophies_mode=MYTROPHIES_FILTER_ALL)
+    def on_mytrophies_filter_all_toggled(self, widget):
+        self.set_display(trophies_mode=MYTROPHIES_FILTER_ALL)
 
     def on_tb_mytrophies_clicked(self, widget):
         """Called when the My Trophies button is clicked."""
-        
+
         mytrophies_toggled = self.tb_mytrophies.get_active()
         opportunities_toggled = self.tb_opportunities.get_active()
-        
-        if mytrophies_toggled == True:
+
+        if mytrophies_toggled is True:
             self.set_display(DISPLAY_MODE_TROPHIES)
         else:
-            self.tb_mytrophies.set_active(True) # This also fires the signal handler
+            self.tb_mytrophies.set_active(True)  # This also fires the signal handler
 
     def on_tb_opportunities_clicked(self, widget):
         """Called when the Opportunities button is clicked."""
-        
+
         self.launcher.set_property("urgent", False)
         self.newtrophies = 0
         self.launcher.set_property("count_visible", False)
-        
+
         mytrophies_toggled = self.tb_mytrophies.get_active()
         opportunities_toggled = self.tb_opportunities.get_active()
-        
-        if opportunities_toggled == True:
+
+        if opportunities_toggled is True:
             self.set_display(DISPLAY_MODE_OPPORTUNITIES)
         else:
-            self.tb_opportunities.set_active(True) # This also fires the signal handler
+            self.tb_opportunities.set_active(True)  # This also fires the signal handler
 
-    def menu_prefs_clicked(self,widget):
+    def menu_prefs_clicked(self, widget):
         """Display the preferences window."""
-        
+
         # If the window already is in use, when user clicks the menu
         # item, present() is used instead, to bring the window to front
         # etc.
@@ -819,24 +816,24 @@
             self.preferences_dialog.prepare(self.libaccom)
             self.preferences_dialog.connect('destroy', self.on_preferences_dialog_destroyed)
             self.preferences_dialog.show()
-    
-    def on_preferences_dialog_destroyed(self,widget):
+
+    def on_preferences_dialog_destroyed(self, widget):
         self.preferences_dialog = None
-    
+
     def get_icon(self, name):
         theme = Gtk.IconTheme.get_default()
         return theme.load_icon(name, 48, 0)
 
     def check_for_extra_info_required(self):
         """Check if the installed accomplishments require additional information to be gathered from the user."""
-        
+
         infoneeded = self.libaccom.get_all_extra_information_required()
 
         if len(infoneeded) is not 0:
             # kick of the process of gathering the information needed
             try:
                 seen = self.libaccom.get_config_value("config", "extrainfo_seen")
-                
+
                 if seen == "NoOption" or seen == 0:
                     self.additional_info_req.set_visible(True)
                     self.libaccom.write_config_file_item("config", "extrainfo_seen", 1)
@@ -857,22 +854,22 @@
         self.libaccom.set_daemon_session_start(True)
         self.additional_daemon_session.set_visible(False)
 
-    def edit_auth_info(self,widget):
+    def edit_auth_info(self, widget):
         """Called when user clicks "Edit credentials" from notification"""
         self.additional_info_req.set_visible(False)
-        self.edit_identification_clicked(widget) #that's maily the same thing
+        self.edit_identification_clicked(widget)  # that's maily the same thing
         return
 
-    def edit_auth_info_cancel(self,widget):
+    def edit_auth_info_cancel(self, widget):
         """Called when user clicks "Later" from extrainfo-needed notification"""
         self.additional_info_req.set_visible(False)
         return
-    
+
     def _load_accomplishments(self):
         # clear the local cache of accomplishments
         self.accomdb = []
         self.accomdb = self.libaccom.build_viewer_database()
-        
+
     def opp_clicked(self, widget):
         selection = widget.get_selected_items()
         if len(selection) is 0:
@@ -881,7 +878,7 @@
         widget.unselect_path(item)
         model = widget.get_model()
         accomID = model[item][COL_ID]
-        self.set_display(DISPLAY_MODE_DETAILS,accomID=accomID)
+        self.set_display(DISPLAY_MODE_DETAILS, accomID=accomID)
 
     def mytrophy_clicked(self, widget):
         selection = widget.get_selected_items()
@@ -891,7 +888,7 @@
         widget.unselect_path(item)
         model = widget.get_model()
         accomID = model[item][COL_ID]
-        self.set_display(DISPLAY_MODE_DETAILS,accomID=accomID)
+        self.set_display(DISPLAY_MODE_DETAILS, accomID=accomID)
 
     def optparse_accomplishment(self, accom_id):
         """Process the -a command line option"""
@@ -899,8 +896,8 @@
             # this accomplishment does not exist! aborting...
             print "There is no accomplishment with this ID."
             return
-                
-        self.set_display(DISPLAY_MODE_DETAILS,accomID=accom_id)
+
+        self.set_display(DISPLAY_MODE_DETAILS, accomID=accom_id)
 
     def prepare_models(self):
         """
@@ -919,31 +916,31 @@
         # Prepare latest trophies iconviews
         if len(self.mytrophies_box_latest.get_children()) == 0:
             self.mytrophies_latest_boxes = []
-            box = self.add_mytrophies_view(self.mytrophies_box_latest,_("Today"), self.trophiesstore_filter_today)
-            self.mytrophies_latest_boxes.append([self.trophiesstore_filter_today,box])
-            box = self.add_mytrophies_view(self.mytrophies_box_latest,_("This Week"), self.trophiesstore_filter_week)
-            self.mytrophies_latest_boxes.append([self.trophiesstore_filter_week,box])
-            box = self.add_mytrophies_view(self.mytrophies_box_latest,_("This Month"), self.trophiesstore_filter_month)
-            self.mytrophies_latest_boxes.append([self.trophiesstore_filter_month,box])
-            box = self.add_mytrophies_view(self.mytrophies_box_latest,_("Last Six Months"), self.trophiesstore_filter_sixmonths)
-            self.mytrophies_latest_boxes.append([self.trophiesstore_filter_sixmonths,box])
-            box = self.add_mytrophies_view(self.mytrophies_box_latest,_("Earlier"), self.trophiesstore_filter_earlier)
-            self.mytrophies_latest_boxes.append([self.trophiesstore_filter_earlier,box])
-            
+            box = self.add_mytrophies_view(self.mytrophies_box_latest, _("Today"), self.trophiesstore_filter_today)
+            self.mytrophies_latest_boxes.append([self.trophiesstore_filter_today, box])
+            box = self.add_mytrophies_view(self.mytrophies_box_latest, _("This Week"), self.trophiesstore_filter_week)
+            self.mytrophies_latest_boxes.append([self.trophiesstore_filter_week, box])
+            box = self.add_mytrophies_view(self.mytrophies_box_latest, _("This Month"), self.trophiesstore_filter_month)
+            self.mytrophies_latest_boxes.append([self.trophiesstore_filter_month, box])
+            box = self.add_mytrophies_view(self.mytrophies_box_latest, _("Last Six Months"), self.trophiesstore_filter_sixmonths)
+            self.mytrophies_latest_boxes.append([self.trophiesstore_filter_sixmonths, box])
+            box = self.add_mytrophies_view(self.mytrophies_box_latest, _("Earlier"), self.trophiesstore_filter_earlier)
+            self.mytrophies_latest_boxes.append([self.trophiesstore_filter_earlier, box])
+
         # Prepare all trophies iconviews
         kids = self.mytrophies_box_all.get_children()
         for kid in kids:
-            self.mytrophies_box_all.remove(k)
+            self.mytrophies_box_all.remove(kid)
         for f in self.trophies_collection_filters:
-            del f[0] #Remove the filter!
+            del f[0]  # Remove the filter!
         self.trophies_collection_filters = []
         collections = self.libaccom.list_collections()
         for c in collections:
             new_filter = self.trophiesstore.filter_new()
-            new_filter.set_visible_func(self._trophy_all_visible_func,c)
+            new_filter.set_visible_func(self._trophy_all_visible_func, c)
             box = self.add_mytrophies_view(self.mytrophies_box_all, self.libaccom.get_collection_name(c), new_filter)
-            self.trophies_collection_filters.append([new_filter,box])
-        
+            self.trophies_collection_filters.append([new_filter, box])
+
     def add_mytrophies_view(self, parent, section, model):
         """
         This function is used for adding a new group of accomplishments in mytrophies view.
@@ -961,95 +958,95 @@
         separator = Gtk.Separator()
         separator.set_property("margin_left", 10)
         separator.set_property("margin_right", 10)
-        
+
         iconview = Gtk.IconView()
         iconview.set_model(model)
         iconview.set_text_column(COL_TITLE)
         iconview.set_pixbuf_column(COL_PIXBUF)
         iconview.set_item_width(120)
         iconview.set_columns(-1)
-        iconview.connect("selection-changed",self.mytrophy_clicked)
+        iconview.connect("selection-changed", self.mytrophy_clicked)
 
         outerbox.pack_start(header, False, False, 0)
         outerbox.pack_start(separator, False, False, 0)
         outerbox.pack_start(iconview, False, False, 0)
         outerbox.show_all()
-        
+
         parent.add(outerbox)
         return outerbox
 
-	def set_display(self, 
-                    mode              = DISPLAY_MODE_UNSPECIFIED,
-                    accomID           = "",
-                    trophies_mode     = MYTROPHIES_FILTER_UNSPECIFIED,
-                    filter_locked     = DISPLAY_FILTER_LOCKED_UNSPECIFIED,
-                    filter_collection = DISPLAY_FILTER_COLLECTION_UNSPECIFIED,
-                    filter_category   = DISPLAY_FILTER_CATEGORY_UNSPECIFIED,
-                    filter_subcat     = DISPLAY_FILTER_SUBCAT_UNSPECIFIED,
-                    search_query      = DISPLAY_FILTER_SEARCH_UNSPECIFIED):
-		"""
-		Switches display mode as specified in arguments.
+    def set_display(self,
+                    mode=DISPLAY_MODE_UNSPECIFIED,
+                    accomID="",
+                    trophies_mode=MYTROPHIES_FILTER_UNSPECIFIED,
+                    filter_locked=DISPLAY_FILTER_LOCKED_UNSPECIFIED,
+                    filter_collection=DISPLAY_FILTER_COLLECTION_UNSPECIFIED,
+                    filter_category=DISPLAY_FILTER_CATEGORY_UNSPECIFIED,
+                    filter_subcat=DISPLAY_FILTER_SUBCAT_UNSPECIFIED,
+                    search_query=DISPLAY_FILTER_SEARCH_UNSPECIFIED):
+        """
+        Switches display mode as specified in arguments.
         It takes care about flipping notebook pages, hiding unnecessary UI pieces etc.
         This function shouldn't be called with many arguments, pass only these that you want to override.
-		"""
+        """
         # The ordering of following IF statements *IS* important!
         # For example, passing both collection and category to this function
         # may not result in skipping some of these data as they get cleared
         # later on. Therefore hierarhical order is desired.
-		if mode is not DISPLAY_MODE_UNSPECIFIED:
-			self.display_mode = mode
+        if mode is not DISPLAY_MODE_UNSPECIFIED:
+            self.display_mode = mode
             # Reflect changes in the UI
             if self.display_mode is DISPLAY_MODE_DETAILS:
                 #Displaying details for an accomplishment
-                
+
                 if accomID == "":
                     print "Unable to display details view, you probably forgot the accomID argument."
                     return
-                    
+
                 # Set togglable buttons to reflect current state
-                self.tb_mytrophies.handler_block_by_func(self.on_tb_mytrophies_clicked)      
-                self.tb_opportunities.handler_block_by_func(self.on_tb_opportunities_clicked) 
-                self.tb_mytrophies.set_active(False) 
+                self.tb_mytrophies.handler_block_by_func(self.on_tb_mytrophies_clicked)
+                self.tb_opportunities.handler_block_by_func(self.on_tb_opportunities_clicked)
+                self.tb_mytrophies.set_active(False)
                 self.tb_opportunities.set_active(False)
                 self.tb_mytrophies.handler_unblock_by_func(self.on_tb_mytrophies_clicked)
                 self.tb_opportunities.handler_unblock_by_func(self.on_tb_opportunities_clicked)
-                
+
                 # Select all characters in searchbar
                 self.searchbar.grab_focus()
-                
+
                 self.notebook.set_current_page(0)
                 self.searchbar_box.hide()
-                    
+
             elif self.display_mode is DISPLAY_MODE_TROPHIES:
                 #Display the list of trophies
-                
+
                 # Set togglable buttons to reflect current state
-                self.tb_mytrophies.handler_block_by_func(self.on_tb_mytrophies_clicked)      
-                self.tb_opportunities.handler_block_by_func(self.on_tb_opportunities_clicked) 
-                self.tb_mytrophies.set_active(True) 
+                self.tb_mytrophies.handler_block_by_func(self.on_tb_mytrophies_clicked)
+                self.tb_opportunities.handler_block_by_func(self.on_tb_opportunities_clicked)
+                self.tb_mytrophies.set_active(True)
                 self.tb_opportunities.set_active(False)
                 self.tb_mytrophies.handler_unblock_by_func(self.on_tb_mytrophies_clicked)
                 self.tb_opportunities.handler_unblock_by_func(self.on_tb_opportunities_clicked)
-                
+
                 # Select all characters in searchbar
                 self.searchbar.grab_focus()
-                        
+
                 self.notebook.set_current_page(1)
                 self.searchbar_box.show()
-               
+
             elif self.display_mode is DISPLAY_MODE_OPPORTUNITIES:
-                
+
                 # Set togglable buttons to reflect current state
-                self.tb_mytrophies.handler_block_by_func(self.on_tb_mytrophies_clicked)      
-                self.tb_opportunities.handler_block_by_func(self.on_tb_opportunities_clicked) 
-                self.tb_mytrophies.set_active(False) 
+                self.tb_mytrophies.handler_block_by_func(self.on_tb_mytrophies_clicked)
+                self.tb_opportunities.handler_block_by_func(self.on_tb_opportunities_clicked)
+                self.tb_mytrophies.set_active(False)
                 self.tb_opportunities.set_active(True)
                 self.tb_mytrophies.handler_unblock_by_func(self.on_tb_mytrophies_clicked)
                 self.tb_opportunities.handler_unblock_by_func(self.on_tb_opportunities_clicked)
-                
+
                 self.notebook.set_current_page(2)
                 self.searchbar_box.show()
-                
+
         if trophies_mode is not MYTROPHIES_FILTER_UNSPECIFIED:
             self.display_mytrophies_filtermode = trophies_mode
             # Show/hide appropriate iconview
@@ -1057,12 +1054,12 @@
                 self.mytrophies_notebook.set_current_page(0)
             elif self.display_mytrophies_filtermode is MYTROPHIES_FILTER_LATEST:
                 self.mytrophies_notebook.set_current_page(1)
-                
+
         if filter_locked is not DISPLAY_FILTER_LOCKED_UNSPECIFIED:
             self.display_filter_locked = filter_locked
         if filter_collection is not DISPLAY_FILTER_COLLECTION_UNSPECIFIED:
             self.display_filter_collection = filter_collection
-            
+
             # As the requested collection changed, we need to update the categories combo.
             if filter_collection == "":
                 self.opp_cat_store.clear()
@@ -1075,28 +1072,27 @@
                 for i in sorted(cats):
                     self.opp_cat_store.append([i, i])
                 self.opp_combo_cat.set_sensitive(True)
-                    
+
             # Set the active item to "everything".
             self.display_filter_category = ""
             self.opp_combo_cat.handler_block_by_func(self.on_filter_category_changed)
             self.opp_combo_cat.set_active(0)
             self.opp_combo_cat.handler_unblock_by_func(self.on_filter_category_changed)
-        
+
             # It is likely that we need to update the subcategories.
             # A special case is when it needs to be hidden after collection change.
             self._update_subcats()
-            
+
         if filter_category is not DISPLAY_FILTER_CATEGORY_UNSPECIFIED:
             self.display_filter_category = filter_category
-            
+
             # Changing category, therefore we should display the subcats bar too.
             self._update_subcats()
-            
+
         if filter_subcat is not DISPLAY_FILTER_SUBCAT_UNSPECIFIED:
-			self.display_filter_subcat = filter_subcat
-		if search_query is not DISPLAY_FILTER_SEARCH_UNSPECIFIED:
-			self.display_filter_search = search_query
-
+            self.display_filter_subcat = filter_subcat
+        if search_query is not DISPLAY_FILTER_SEARCH_UNSPECIFIED:
+            self.display_filter_search = search_query
 
         # Finally, pass refreshing/rerendering to specialised functions
         if self.display_mode is DISPLAY_MODE_DETAILS:
@@ -1105,7 +1101,7 @@
             self._update_mytrophy_view()
         elif self.display_mode is DISPLAY_MODE_OPPORTUNITIES:
             self._update_opportunities_view()
-            
+
     def _update_mytrophy_view(self):
         # Causes the treemodel to call visible_func for all rows.
         # It also hides/shows boxes depending on whether they are empty.
@@ -1113,7 +1109,7 @@
             filterlist = self.trophies_collection_filters
         elif self.display_mytrophies_filtermode is MYTROPHIES_FILTER_LATEST:
             filterlist = self.mytrophies_latest_boxes
-            
+
         for f in filterlist:
             f[0].refilter()
             if len(f[0]) is 0:
@@ -1124,7 +1120,7 @@
     def _update_opportunities_view(self):
         # Causes the treemodel to call visible_func for all rows.
         self.oppstore_filtered.refilter()
-        
+
     def _opp_visible_func(self, model, iterator, data):
         """
         This function is crucial for filtering opportunities. It is called
@@ -1133,26 +1129,29 @@
         should be displayed or not.
         """
         # If we are hiding locked accoms:
-        if (self.display_filter_locked is DISPLAY_FILTER_LOCKED_HIDE) and model.get_value(iterator,COL_LOCKED):
+        if (self.display_filter_locked is DISPLAY_FILTER_LOCKED_HIDE) and model.get_value(iterator, COL_LOCKED):
             return False
         # If we ale looking for a certain collection:
-        if (self.display_filter_collection != "") and (self.display_filter_collection != model.get_value(iterator,COL_COLLECTION)):
+        if (self.display_filter_collection != "") and (self.display_filter_collection != model.get_value(iterator, COL_COLLECTION)):
             return False
         # If we ale looking for a certain category...
         if (self.display_filter_category != ""):
             #...and a subcategory
             if (self.display_filter_subcat != ""):
                 q = self.display_filter_category + ":" + self.display_filter_subcat
-                if not (q in model.get_value(iterator,COL_CATEGORIES)):
+                if not (q in model.get_value(iterator, COL_CATEGORIES)):
                     return False
-            if not (self.display_filter_category in model.get_value(iterator,COL_CATEGORIES)):
+            if not (self.display_filter_category in model.get_value(iterator, COL_CATEGORIES)):
                 return False
         # If there is a search term and this row does not match the query:
-        if (self.display_filter_search != "") and  not (self.display_filter_search.lower() in model.get_value(iterator,COL_TITLE).lower()) and not (self.display_filter_search.lower() in model.get_value(iterator,COL_KEYWORDS).lower()) and not (self.display_filter_search.lower() in model.get_value(iterator,COL_ID).split("/")[1].lower()):
-			return False
+        if (self.display_filter_search != "") \
+                and not (self.display_filter_search.lower() in model.get_value(iterator, COL_TITLE).lower()) \
+                and not (self.display_filter_search.lower() in model.get_value(iterator, COL_KEYWORDS).lower()) \
+                and not (self.display_filter_search.lower() in model.get_value(iterator, COL_ID).split("/")[1].lower()):
+            return False
         return True
 
-    def _trophy_recent_visible_func(self,model,iterator,data):
+    def _trophy_recent_visible_func(self, model, iterator, data):
         """
         This function is crucial for filtering recently awarded trophies. It is called
         by some internal GTK callbacks, whenever the treemodel changes.
@@ -1164,50 +1163,53 @@
 
         #XXX: Making these constants global might save some filtering time.
         today = datetime.date.today()
-        margin_today = datetime.timedelta(days = 1)
-        margin_week = datetime.timedelta(days = 7)
-        margin_month = datetime.timedelta(days = 31)
-        margin_sixmonths = datetime.timedelta(days = 180)
-        
-        when = model.get_value(iterator,COL_DATE_ACCOMPLISHED)
+        margin_today = datetime.timedelta(days=1)
+        margin_week = datetime.timedelta(days=7)
+        margin_month = datetime.timedelta(days=31)
+        margin_sixmonths = datetime.timedelta(days=180)
+
+        when = model.get_value(iterator, COL_DATE_ACCOMPLISHED)
         if when == "None":
             return False
         year, month, day = when.split("-")
         when = datetime.date(int(year), int(month), int(day.split(" ")[0]))
-            
+
         if (today - margin_today <= when <= today + margin_today):
             if data is TROPHIES_FILTER_TODAY:
-                pass #proceed to further filtering
+                pass  # proceed to further filtering
             else:
                 return False
         elif (today - margin_week <= when <= today + margin_week):
             if data is TROPHIES_FILTER_WEEK:
-                pass #proceed to further filtering
+                pass  # proceed to further filtering
             else:
                 return False
         elif (today - margin_month <= when <= today + margin_month):
             if data is TROPHIES_FILTER_MONTH:
-                pass #proceed to further filtering
+                pass  # proceed to further filtering
             else:
                 return False
         elif (today - margin_sixmonths <= when <= today + margin_sixmonths):
             if data is TROPHIES_FILTER_SIXMONTHS:
-                pass #proceed to further filtering
+                pass  # proceed to further filtering
             else:
                 return False
         else:
             if data is TROPHIES_FILTER_EARLIER:
-                pass #proceed to further filtering
+                pass  # proceed to further filtering
             else:
                 return False
-                
+
         # If there is a search term and this row does not match the query:
-        if (self.display_filter_search != "") and not (self.display_filter_search.lower() in model.get_value(iterator,COL_TITLE).lower()) and not (self.display_filter_search.lower() in model.get_value(iterator,COL_KEYWORDS).lower()) and not (self.display_filter_search.lower() in model.get_value(iterator,COL_ID).split("/")[1].lower()):
-			return False
-            
+        if (self.display_filter_search != "") \
+                and not (self.display_filter_search.lower() in model.get_value(iterator, COL_TITLE).lower()) \
+                and not (self.display_filter_search.lower() in model.get_value(iterator, COL_KEYWORDS).lower()) \
+                and not (self.display_filter_search.lower() in model.get_value(iterator, COL_ID).split("/")[1].lower()):
+            return False
+
         return True
-        
-    def _trophy_all_visible_func(self,model,iterator,collection):
+
+    def _trophy_all_visible_func(self, model, iterator, collection):
         """
         This function is crucial for filtering mytrophies. It is called
         by some internal GTK callbacks, whenever the treemodel changes.
@@ -1216,14 +1218,16 @@
         The @data argument specifies filtered collection.
         """
         # If row's collection matches the desired for this filter
-        if (collection != model.get_value(iterator,COL_COLLECTION)):
+        if (collection != model.get_value(iterator, COL_COLLECTION)):
             return False
         # If there is a search term and this row does not match the query:
-        if (self.display_filter_search != "") and  not (self.display_filter_search.lower() in model.get_value(iterator,COL_TITLE).lower()) and not (self.display_filter_search.lower() in model.get_value(iterator,COL_ID).split("/")[1].lower()):
-			return False
+        if (self.display_filter_search != "") \
+                and not (self.display_filter_search.lower() in model.get_value(iterator, COL_TITLE).lower()) \
+                and not (self.display_filter_search.lower() in model.get_value(iterator, COL_ID).split("/")[1].lower()):
+            return False
         return True
 
-    def _update_subcats(self):  
+    def _update_subcats(self):
         """
         This function creates the buttons for subcategories, requesting required data from the daemon.
         """
@@ -1238,15 +1242,17 @@
                     tempcats = cats[c]
 
             finalcats = []
-            
+
             for s in tempcats:
                 for i in self.accomdb:
-                    if i["collection"] == self.display_filter_collection and i["categories"][0] == self.display_filter_category + ":" + s and i["accomplished"] == False:
+                    if i["collection"] == self.display_filter_collection \
+                            and i["categories"][0] == self.display_filter_category + ":" + s \
+                            and i["accomplished"] is False:
                         finalcats.append(s)
 
             # convert to a set to remove dupes
             finalcats = set(finalcats)
-            
+
             # remove previous buttons from the button box
             for b in self.subcats_buttonbox.get_children():
                 self.subcats_buttonbox.remove(b)
@@ -1258,7 +1264,7 @@
                 button.connect("clicked", self.subcat_clicked, "")
                 self.subcats_buttonbox.add(button)
                 button.show()
-                
+
                 # fill the button box with the sub categories
                 for s in finalcats:
                     button = Gtk.Button(s)
@@ -1266,34 +1272,37 @@
                     button.connect("clicked", self.subcat_clicked, s)
                     self.subcats_buttonbox.add(button)
                     button.show()
-                    
+
                 self.subcats_buttonbox.show_all()
                 self.subcats_container.show()
             else:
                 self.subcats_container.hide()
-            
+
     def _accomplishment_info(self, accomID):
         """Display information about the selected accomplishment."""
         data = []
-        
+
         # determine dependencies
-        
+
         deps = []
         depstatus = []
-        
+
         deps = self.libaccom.get_accom_depends(accomID)
-        
+
         for acc in self.accomdb:
             for d in deps:
                 if acc["id"] == d:
-                    depstatus.append({ "id" : acc["id"], "accomplished" : acc["accomplished"], "collection-human" : acc["collection-human"], "title" : acc["title"] })
-        
-        
+                    depstatus.append({
+                        "id": acc["id"],
+                        "accomplished": acc["accomplished"],
+                        "collection-human": acc["collection-human"],
+                        "title": acc["title"]
+                    })
+
         achieved = self.libaccom.get_accom_is_accomplished(accomID)
         data = self.libaccom.get_accom_data(accomID)
         if achieved:
             trophydata = self.libaccom.get_trophy_data(accomID)
-        
 
         html = None
 
@@ -1311,17 +1320,16 @@
             html = html + "<div id='header' class='grid_8'> \
                 <h1>" + data['title'] + "</h1> \
                 </div>"
-                
-
 
         ## summary table
         html = html + "<div id='accomplishment' class='grid_8 clearfix'> \
         <div id='accomplishment-badge' class='grid_8 clearfix'>"
 
         if achieved and GWIBBER_OK:
-            html = html + "<div id='social-share'><a href='gwibber-share?accomID="+accomID+"' id='gwibber-share'>+SHARE</a></div>"
+            html = html + "<div id='social-share'><a href='gwibber-share?accomID=" + accomID + \
+                "' id='gwibber-share'>+SHARE</a></div>"
 
-        html = html +"<img class='icon' src='" + str(iconpath) + "'> \
+        html = html + "<img class='icon' src='" + str(iconpath) + "'> \
             <div class='grid_3 block'> \
                 <h4>" + _("Opportunity Information").decode('utf-8') + ":</h4> \
             <ul class='none'> \
@@ -1332,53 +1340,59 @@
             html = html + description
         else:
             html = html + _("No information available.").decode('utf-8')
-                
-                
+
         html = html + "</li> \
             </ul> \
             </div>"
 
         if not achieved:
-        
+
             html = html + "<div class='grid_3 block'> \
             <h4>" + _("Getting Help").decode('utf-8') + ":</h4> \
             <ul class='none'>"
-            
+
             if "help" in data:
                 help = data["help"]
 
                 for l in help.split('\n'):
-                    channelName = l[l.find("#")+1:l.find(" ")]
-                    if l.startswith( '#'+channelName ):
-                        l = "<a style='color:#FFF' href='http://webchat.freenode.net/?channels="+channelName+"'>"+'#'+channelName+" on freenode</a>"                 
+                    channelName = l[l.find("#") + 1:l.find(" ")]
+                    if l.startswith('#' + channelName):
+                        l = "<a style='color:#FFF' href='http://webchat.freenode.net/?channels=" + channelName + "'>" \
+                            + '#' + channelName + " on freenode</a>"
                         html = html + "<li>" + l + "</li>"
                     else:
-                        html = html + "<li>" + l + "</li>"  
+                        html = html + "<li>" + l + "</li>"
             else:
                 html = html + "<li>" + _("No help available.").decode('utf-8') + "</li>"
-            
+
             html = html + "</ul></div>"
 
-
         html = html + "</div>"
 
         html = html + "<div id='accomplishment-conditions' class='grid_8'> \
             <ul class='none'>"
-            
+
         if "depends" in data:
             # check if it is locked
             if not self.libaccom.get_accom_is_unlocked(accomID):
                 if len(depstatus) > 0:
                     if len(depstatus) == 1:
-                        html = html + "<li><i class='icon-key icon-large'></i>" + _("This opportunity is locked. You need to complete").decode('utf-8') + " <a href='accomplishment://" + depstatus[0]["id"] + "'><strong>" + depstatus[0]["title"] + "</strong></a> " + _("from").decode('utf-8') +" <strong>" + depstatus[0]["collection-human"] + "</strong> " + _("first").decode('utf-8') + ".</li>"
+                        html = html + "<li><i class='icon-key icon-large'></i>" + \
+                            _("This opportunity is locked. You need to complete").decode('utf-8') + \
+                            " <a href='accomplishment://" + depstatus[0]["id"] + "'><strong>" + \
+                            depstatus[0]["title"] + "</strong></a> " + _("from").decode('utf-8') + \
+                            " <strong>" + depstatus[0]["collection-human"] + "</strong> " + \
+                            _("first").decode('utf-8') + ".</li>"
                     else:
                         html = html + "<li><i class='icon-key icon-large'></i>" + _("This opportunity is locked. You need to complete the following opportunities first:").decode('utf-8') + "</li>"
                         for d in depstatus:
-                            if d["accomplished"] == False:
-                                html = html + "<li class='deps_child'><a href='accomplishment://" + d["id"] + "'><strong>" + d["title"] + "</strong></a> " + _("from").decode('utf-8') +" <strong>" + d["collection-human"] + "</strong></li>"
+                            if d["accomplished"] is False:
+                                html = html + "<li class='deps_child'><a href='accomplishment://" + d["id"] + \
+                                    "'><strong>" + d["title"] + "</strong></a> " + _("from").decode('utf-8') + \
+                                    " <strong>" + d["collection-human"] + "</strong></li>"
         if achieved:
             #achieved
-            
+
             html = html + "<li><img src='" + str(get_media_file("verify-icon.png")) + "' height='20' />" + _("This trophy <strong>was awarded</strong>").decode('utf-8')
 
             if "date-accomplished" in trophydata:
@@ -1389,10 +1403,10 @@
                 extrainfo = trophydata["needs-information"].split(" ")
                 html = html + ", " + _("using the following credentials").decode('utf-8') + ":</li><li><ul class='big'>"
                 for i in extrainfo:
-                    e = self.libaccom.get_extra_information(accomID.split("/")[0],i)
+                    e = self.libaccom.get_extra_information(accomID.split("/")[0], i)
                     html = html + "<li>" + e[0]["label"] + ": " + trophydata[i] + "</li>"
                 html = html + "</ul></li>"
-            else:       
+            else:
                 html = html + ".</li>"
 
             if "needs-signing" in data:
@@ -1430,17 +1444,15 @@
         else:
             #details not hidden by default
             html = html + "<div>"
-        
-        
+
         if "summary" in data:
             html = html + "<div id='accompilshment-info' class='grid_8'>"
             summary = data["summary"]
             for l in summary.split('\n'):
-                html = html  + "<p>" + l + "</p>"
+                html = html + "<p>" + l + "</p>"
             html = html + "</div>"
 
-
-        html = html + "<div id='accomplishment-more'  class='grid_8'>"
+        html = html + "<div id='accomplishment-more' class='grid_8'>"
 
         if "steps" in data:
 
@@ -1448,7 +1460,7 @@
                 <i class='icon-list'></i> \
                 <h2>" + _("How to accomplish this opportunity").decode('utf-8') + "</h2> \
                 <ol>"
-            
+
             steps = data["steps"]
             for l in steps.split('\n'):
                 html = html + "<li class='icon-pushpin'>" + l + "</li>"
@@ -1458,7 +1470,7 @@
         showtipspitfalls = False
         haspitfalls = False
         hastips = False
-        
+
         if "tips" in data or "pitfalls" in data:
             try:
                 if not data["tips"] == "None":
@@ -1466,51 +1478,51 @@
                     hastips = True
             except:
                 hastips = False
-                
+
             try:
                 if not data["pitfalls"] == "None":
-                    showtipspitfalls = True                                       
+                    showtipspitfalls = True
                     haspitfalls = True
             except:
                 haspitfalls = False
-                
-            if showtipspitfalls == True:
+
+            if showtipspitfalls is True:
                 html = html + "  <div id='tipspitfalls' class='grid_8 clearfix'>"
         else:
-            showtipspitfalls == False
-                
-        if showtipspitfalls == True:
+            showtipspitfalls is False
+
+        if showtipspitfalls is True:
             html = html + "<div class='grid_4 block left' id='tips'>"
             html = html + "<h2>" + _("Tips and Tricks").decode('utf-8') + ":</h2>"
-            
-            if hastips == True:
+
+            if hastips is True:
                 tips = data["tips"]
             else:
                 tips = None
-            
+
             html = html + "<ul>"
 
-            if tips == None:
+            if tips is None:
                 html = html + "<li class='icon-ok'>" + _("None.").decode('utf-8') + "</li>"
             else:
                 for t in tips.split('\n'):
                     html = html + "<li class='icon-ok'>" + t + "</li>"
-            
+
             html = html + "</ul>"
             html = html + "</div>"
 
             html = html + "<div id='divider' class='left'>&nbsp;</div>"
             html = html + "<div class='grid_3 block left' id='pitfals'>"
             html = html + "<h2>" + _("Pitfalls To Avoid").decode('utf-8') + ":</h2>"
-            
-            if haspitfalls == True:
+
+            if haspitfalls is True:
                 pitfalls = data["pitfalls"]
             else:
                 pitfalls = None
-            
+
             html = html + "<ul>"
 
-            if pitfalls == None:
+            if pitfalls is None:
                 html = html + "<li class='icon-remove'>" + _("None.").decode('utf-8') + "</li>"
             else:
                 for p in pitfalls.split('\n'):
@@ -1537,4 +1549,3 @@
 
         self.webview.load_html_string(html, "file:///")
         self.webview.show()
-

=== modified file 'accomplishments_viewer/EditExtrainfoDialog.py'
--- accomplishments_viewer/EditExtrainfoDialog.py	2012-11-22 10:42:15 +0000
+++ accomplishments_viewer/EditExtrainfoDialog.py	2012-11-26 16:03:25 +0000
@@ -1,48 +1,45 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
-import logging
 
-from gi.repository import Gtk # pylint: disable=E0611
+from gi.repository import Gtk  # pylint: disable=E0611
 from operator import itemgetter
 from accomplishments_viewer_lib.helpers import get_builder
-from accomplishments.daemon import dbusapi
 
-import gettext, locale
-from locale import gettext as _
+import gettext
+import locale
 from accomplishments.util.paths import locale_dir
 locale.bindtextdomain('accomplishments-viewer', locale_dir)
-gettext.bindtextdomain('accomplishments-viewer',locale_dir)
+gettext.bindtextdomain('accomplishments-viewer', locale_dir)
 locale.textdomain('accomplishments-viewer')
-       
-        
-        
+
+
 class EditExtrainfoDialog(Gtk.Dialog):
     __gtype_name__ = "EditExtrainfoDialog"
-    
+
     def __new__(cls):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
-        
+
         Returns a fully instantiated EditExtrainfoDialog object.
         """
         builder = get_builder('EditExtrainfoDialog')
         new_object = builder.get_object('edit_extrainfo_dialog')
         new_object.finish_initializing(builder)
         return new_object
-    
+
     def finish_initializing(self, builder):
         """Called when we're finished initializing.
 
@@ -54,33 +51,33 @@
         # Get a reference to the builder and set up the signals.
         self.builder = builder
         self.ui = builder.get_ui(self)
-        self.auth_box = builder.get_object('auth_box')  
-        self.btn_ok = builder.get_object('btn_ok')  
-        
-    def prepare(self,libaccom):
+        self.auth_box = builder.get_object('auth_box')
+        self.btn_ok = builder.get_object('btn_ok')
+
+    def prepare(self, libaccom):
         """Called before run()nig, setups the window"""
         # use self.parent.libaccom for calling
         # use self.parent.connected to check if connected to daemon
         self.libaccom = libaccom
-        
+
         i = self.libaccom.get_all_extra_information()
-        
+
         self.entries_map = {}
-        
+
         #remove all widgets that are contained in the auth_box
         #they will be there since the previous prepare() call
         c = self.auth_box.get_child()
         if c is not None:
             self.auth_box.remove(c)
-            
+
         if len(i) is not 0:
             #there what to ask for
             self.main_box = Gtk.VBox()
             self.auth_box.add(self.main_box)
-                    
+
             #essential. It ensures we'll append items to section_dict, in an unchanging order.
             infoneeded = sorted(i, key=itemgetter('collection'))
-            
+
             section_dict = {}
             extrainfo_dict = {}
             #section dict looks like: { "launchpad-email" : ["ubuntu-community","ubuntu-community-italy"],
@@ -96,43 +93,42 @@
                     extrainfo_dict[i["needs-information"]] = i
             for a in section_dict:
                 section_dict[a] = tuple(section_dict[a])
-                 
-              
+
             rev_section_dict = {}
             #the rev_section_dict shal be the grouped inverse of section_dict:
             #                         { ("ubuntu-community","ubuntu-community-italy",) : ["launchpad-email","magic-token"],
             #                           ("askubuntu",)                                 : ["askubuntu-login"],
             #                           ("openshot", "otherapp",)                      : ["github-id"]       }
-            #    
-                             
+            #
+
             for i in section_dict:
                 d = section_dict[i]
                 if d not in rev_section_dict:
                     rev_section_dict[d] = list([i])
                 else:
                     rev_section_dict[d].append(i)
-                           
-            #print rev_section_dict  
-            
+
+            #print rev_section_dict
+
             for i in sorted(rev_section_dict.keys(), reverse=True, key=len):
                 #the gui code is here - done for every GROUP of entry fields
                 d = rev_section_dict[i]
-                
+
                 g_box = Gtk.VBox()
                 g_box.set_margin_bottom(20)
                 g_box.set_margin_left(10)
-                self.main_box.pack_start(g_box,True,False,0)
-                
+                self.main_box.pack_start(g_box, True, False, 0)
+
                 g_upbox = Gtk.HBox()
-                g_box.pack_start(g_upbox,True,False,0)
-                
+                g_box.pack_start(g_upbox, True, False, 0)
+
                 g_upimage = Gtk.Image()
                 g_upimage.set_margin_left(5)
                 g_upimage.set_margin_top(5)
                 g_upimage.set_margin_bottom(5)
                 g_upimage.set_margin_right(5)
-                g_upimage.set_from_stock(Gtk.STOCK_GO_FORWARD,Gtk.IconSize.LARGE_TOOLBAR)
-                
+                g_upimage.set_from_stock(Gtk.STOCK_GO_FORWARD, Gtk.IconSize.LARGE_TOOLBAR)
+
                 #temporarily we'll use an ugly name
                 n = len(i)
                 if n is 1:
@@ -141,32 +137,32 @@
                     name = self.libaccom.get_collection_name(i[0]) + " and " + self.libaccom.get_collection_name(i[1])
                 else:
                     name = ""
-                    for k in range(0,n):
-                        if n-k > 2:
+                    for k in range(0, n):
+                        if n - k > 2:
                             name = name + self.libaccom.get_collection_name(i[k]) + ", "
-                        elif n-k is 2:
+                        elif n - k is 2:
                             name = name + self.libaccom.get_collection_name(i[k]) + " and "
-                        elif n-k is 1:
+                        elif n - k is 1:
                             name = name + self.libaccom.get_collection_name(i[k])
-                           
+
                 g_uplabel = Gtk.Label("<big><b>" + name + "</b></big>")
                 g_uplabel.set_use_markup(True)
                 g_uplabel.set_margin_left(10)
                 #g_uplabel.set_halign(Gtk.Align.START)
-                
+
                 g_sep = Gtk.HSeparator()
-                g_box.pack_start(g_sep,True,False,0)
-                
+                g_box.pack_start(g_sep, True, False, 0)
+
                 for f in d:
                     #for each information field in the group...
                     extrainfo = extrainfo_dict[f]
                     label = extrainfo['label']
-                    label = label.replace("&","&amp;") #pango would complain on that
+                    label = label.replace("&", "&amp;")  # pango would complain on that
                     description = extrainfo['description']
-                    description = description.replace("&","&amp;") #pango would complain on that
+                    description = description.replace("&", "&amp;")  # pango would complain on that
                     value = extrainfo['value']
                     example = extrainfo.get('example')
-                    
+
                     g_entrybox = Gtk.HBox()
                     g_mainlabel = Gtk.Label(label)
                     g_mainlabel.set_justify(Gtk.Justification.RIGHT)
@@ -177,31 +173,31 @@
                     g_entry.set_text(value)
                     g_desclabel = Gtk.Label("<small><small><b>" + description + "</b></small></small>")
                     g_desclabel.set_use_markup(True)
-                    g_desclabel.set_alignment(1,0)
+                    g_desclabel.set_alignment(1, 0)
 
                     if example:
                         g_example = Gtk.Label("<small><small><b>Example: " + example + "</b></small></small>")
                         g_example.set_use_markup(True)
-                        g_example.set_alignment(1,0)
+                        g_example.set_alignment(1, 0)
                         g_example.set_margin_right(20)
-                    
+
                     g_entrybox.set_margin_right(20)
                     g_desclabel.set_margin_right(20)
-                    
-                    g_box.pack_start(g_entrybox,True,False,0)
-                    g_box.pack_start(g_desclabel,True,False,0)
+
+                    g_box.pack_start(g_entrybox, True, False, 0)
+                    g_box.pack_start(g_desclabel, True, False, 0)
                     if example:
-                        g_box.pack_start(g_example,True,False,0)
-                    g_entrybox.pack_end(g_entry,False,False,0)
-                    g_entrybox.pack_end(g_mainlabel,False,False,0)
-                    
-                    self.entries_map[f] = [g_entry,value]
-                    
-                g_upbox.pack_start(g_upimage,False,False,0)
-                g_upbox.pack_start(g_uplabel,False,True,0)
-                
+                        g_box.pack_start(g_example, True, False, 0)
+                    g_entrybox.pack_end(g_entry, False, False, 0)
+                    g_entrybox.pack_end(g_mainlabel, False, False, 0)
+
+                    self.entries_map[f] = [g_entry, value]
+
+                g_upbox.pack_start(g_upimage, False, False, 0)
+                g_upbox.pack_start(g_uplabel, False, True, 0)
+
             self.auth_box.show_all()
-                
+
         else:
             #no point in asking at all
             label = Gtk.Label("<i>(no extra-information is required, most likely there is something wrong with your installtion)</i>")
@@ -214,26 +210,25 @@
         """Proxy function that simply calls the OK button when the user
         has pressed Enter on a textbox."""
         self.btn_ok.clicked()
-        
 
     def on_btn_ok_clicked(self, widget, data=None):
         """The user has elected to save the changes.
         Called before the dialog returns Gtk.ResponseType.OK from run().
-        """      
-        
+        """
+
         #saving the data should happen here.
         anything_changed = False
         for f in self.entries_map:
-            entry     = self.entries_map[f][0]
+            entry = self.entries_map[f][0]
             origvalue = self.entries_map[f][1]
-            newvalue  = entry.get_text()
+            newvalue = entry.get_text()
             if newvalue == origvalue:
                 pass
             else:
                 #print "value " + f + " changed"
                 anything_changed = True
-                self.libaccom.write_extra_information_file(f,newvalue)
-                
+                self.libaccom.write_extra_information_file(f, newvalue)
+
         if anything_changed:
             self.libaccom.run_scripts(True)
 

=== modified file 'accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py'
--- accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py	2012-09-07 18:19:02 +0000
+++ accomplishments_viewer/PreferencesAccomplishmentsViewerDialog.py	2012-11-26 16:03:25 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -20,27 +20,24 @@
 # data/glib-2.0/schemas/net.launchpad.accomplishments-viewer.gschema.xml
 # See http://developer.gnome.org/gio/stable/GSettings.html for more info.
 
-from gi.repository import Gio # pylint: disable=E0611
-
-import gettext, locale
+import gettext
+import locale
 from locale import gettext as _
 from accomplishments.util.paths import locale_dir
 locale.bindtextdomain('accomplishments-viewer', locale_dir)
-gettext.bindtextdomain('accomplishments-viewer',locale_dir)
+gettext.bindtextdomain('accomplishments-viewer', locale_dir)
 locale.textdomain('accomplishments-viewer')
 
-from accomplishments.daemon import dbusapi
-import os, xdg.BaseDirectory, ConfigParser
-
 import logging
 logger = logging.getLogger('accomplishments_viewer')
 
 from accomplishments_viewer_lib.PreferencesDialog import PreferencesDialog
 
+
 class PreferencesAccomplishmentsViewerDialog(PreferencesDialog):
     __gtype_name__ = "PreferencesAccomplishmentsViewerDialog"
 
-    def finish_initializing(self, builder): # pylint: disable=E1002
+    def finish_initializing(self, builder):  # pylint: disable=E1002
         """Set up the preferences dialog"""
         super(PreferencesAccomplishmentsViewerDialog, self).finish_initializing(builder)
         self.cb_daemonsessionstart = self.builder.get_object("cb_daemonsessionstart")
@@ -49,9 +46,9 @@
         self.pref_publish_label = self.builder.get_object("pref_publish_label")
         self.pref_publish_icon = self.builder.get_object("pref_publish_icon")
         self.publishedstatus = None
-        
+
         #trophydir = self.libaccom.get_config_value("config", "trophypath")
-        
+
         # Bind each preference widget to gsettings
         #settings = Gio.Settings("net.launchpad.accomplishments-viewer")
         #widget = self.builder.get_object('example_entry')
@@ -59,21 +56,21 @@
 
         # Code for other initialization actions should be added here.
 
-    def prepare(self,daemon_handle):
+    def prepare(self, daemon_handle):
         self.libaccom = daemon_handle
         self.populate_settings()
-        
+
         self.publishedstatus = self.libaccom.get_published_status()
-        
+
         if self.publishedstatus == 0:
             self.pref_publish.set_label(_("Publish..."))
         else:
             self.pref_publish.set_label(_("Stop Publishing"))
-        
+
     def populate_settings(self):
         self.cb_daemonsessionstart.handler_block_by_func(self.cb_daemonsessionstart_toggled)
         self.cb_hideu1bubbles.handler_block_by_func(self.cb_hideu1bubbles_toggled)
-        
+
         self.cb_daemonsessionstart.set_active(bool(self.libaccom.get_daemon_session_start()))
         print self.libaccom.get_daemon_session_start()
         print type(self.libaccom.get_daemon_session_start())
@@ -81,13 +78,13 @@
 
         self.cb_daemonsessionstart.handler_unblock_by_func(self.cb_daemonsessionstart_toggled)
         self.cb_hideu1bubbles.handler_unblock_by_func(self.cb_hideu1bubbles_toggled)
-        
+
     def cb_daemonsessionstart_toggled(self, widget):
         print widget.get_active()
-        self.libaccom.set_daemon_session_start( widget.get_active() )
+        self.libaccom.set_daemon_session_start(widget.get_active())
 
     def cb_hideu1bubbles_toggled(self, widget):
-        self.libaccom.set_block_ubuntuone_notification_bubbles( widget.get_active() )
+        self.libaccom.set_block_ubuntuone_notification_bubbles(widget.get_active())
 
     def on_pref_publish_clicked(self, widget):
         if self.publishedstatus == 0:

=== modified file 'accomplishments_viewer/__init__.py'
--- accomplishments_viewer/__init__.py	2012-11-22 10:04:35 +0000
+++ accomplishments_viewer/__init__.py	2012-11-26 16:03:25 +0000
@@ -1,34 +1,36 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 import optparse
 
-import gettext, locale
+import gettext
+import locale
 from locale import gettext as _
 from accomplishments.util.paths import locale_dir
 locale.bindtextdomain('accomplishments-viewer', locale_dir)
-gettext.bindtextdomain('accomplishments-viewer',locale_dir)
+gettext.bindtextdomain('accomplishments-viewer', locale_dir)
 locale.textdomain('accomplishments-viewer')
 
-from gi.repository import Gtk, GObject # pylint: disable=E0611
+from gi.repository import Gtk, GObject  # pylint: disable=E0611
 
 from accomplishments_viewer import AccomplishmentsViewerWindow
 
 from accomplishments_viewer_lib import set_up_logging, get_version
 
+
 def parse_options():
     """Support for command line options"""
     parser = optparse.OptionParser(version="%%prog %s" % get_version())
@@ -39,20 +41,21 @@
         "-a", "--accomplishment", action="store", dest="id",
         help=_("Display information about the provided accomplishment ID (e.g. 'ubuntu-community/registered-on-launchpad')").decode('utf-8'))
     (options, args) = parser.parse_args()
-    
+
     set_up_logging(options)
     return options
 
+
 def main():
     'constructor for your class instances'
     GObject.threads_init()
     options = parse_options()
 
-    # Run the application.    
+    # Run the application.
     window = AccomplishmentsViewerWindow.AccomplishmentsViewerWindow()
-    
+
     if options.id:
         window.optparse_accomplishment(options.id)
-    
+
     window.show()
     Gtk.main()

=== modified file 'accomplishments_viewer_lib/AboutDialog.py'
--- accomplishments_viewer_lib/AboutDialog.py	2012-09-07 18:19:02 +0000
+++ accomplishments_viewer_lib/AboutDialog.py	2012-11-26 16:03:25 +0000
@@ -1,32 +1,33 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 ### DO NOT EDIT THIS FILE ###
 
-from gi.repository import Gtk # pylint: disable=E0611
+from gi.repository import Gtk  # pylint: disable=E0611
 
 from . helpers import get_builder
 
+
 class AboutDialog(Gtk.AboutDialog):
     __gtype_name__ = "AboutDialog"
 
     def __new__(cls):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
-        
+
         Returns a fully instantiated AboutDialog object.
         """
         builder = get_builder('AboutAccomplishmentsViewerDialog')
@@ -41,10 +42,9 @@
         and creating a AboutDialog object with it in order
         to finish initializing the start of the new AboutAccomplishmentsViewerDialog
         instance.
-        
+
         Put your initialization code in here and leave __init__ undefined.
         """
         # Get a reference to the builder and set up the signals.
         self.builder = builder
         self.ui = builder.get_ui(self)
-

=== modified file 'accomplishments_viewer_lib/Builder.py'
--- accomplishments_viewer_lib/Builder.py	2012-09-07 18:19:02 +0000
+++ accomplishments_viewer_lib/Builder.py	2012-11-26 16:03:25 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -18,7 +18,7 @@
 
 '''Enhances builder connections, provides object to access glade objects'''
 
-from gi.repository import GObject, Gtk # pylint: disable=E0611
+from gi.repository import GObject, Gtk  # pylint: disable=E0611
 
 import inspect
 import functools
@@ -54,8 +54,7 @@
 
 # pylint: disable=R0201
 # this is a method so that a subclass of Builder can redefine it
-    def default_handler(self,
-        handler_name, filename, *args, **kwargs):
+    def default_handler(self, handler_name, filename, *args, **kwargs):
         '''helps the apprentice guru
 
     glade defined handlers that do not exist come here instead.
@@ -108,7 +107,8 @@
         ele_signals = tree.getiterator("signal")
         for ele_signal in ele_signals:
             self.glade_handler_dict.update(
-            {ele_signal.attrib["handler"]: None})
+                {ele_signal.attrib["handler"]: None}
+            )
 
     def connect_signals(self, callback_obj):
         '''connect the handlers defined in glade
@@ -129,8 +129,7 @@
                 connection_dict[item[0]] = handler
 
                 # replace the run time warning
-                logger.warn("expected handler '%s' in %s",
-                 item[0], filename)
+                logger.warn("expected handler '%s' in %s", item[0], filename)
 
         # connect glade define handlers
         Gtk.Builder.connect_signals(self, connection_dict)
@@ -139,7 +138,7 @@
         for connection in self.connections:
             widget_name, signal_name, handler_name = connection
             logger.debug("connect builder by design '%s', '%s', '%s'",
-             widget_name, signal_name, handler_name)
+                         widget_name, signal_name, handler_name)
 
     def get_ui(self, callback_obj=None, by_name=True):
         '''Creates the ui object with widgets as attributes
@@ -175,7 +174,7 @@
         cannot_message = """cannot bind ui.%s, name already exists
         consider using a pythonic name instead of design name '%s'"""
         consider_message = """consider using a pythonic name instead of design name '%s'"""
-        
+
         for (widget_name, widget) in widget_dict.items():
             pyname = make_pyname(widget_name)
             if pyname != widget_name:
@@ -201,14 +200,14 @@
     pyname = ''
     for character in name:
         if (character.isalpha() or character == '_' or
-            (pyname and character.isdigit())):
+                (pyname and character.isdigit())):
             pyname += character
         else:
             pyname += '_'
     return pyname
 
 
-# Until bug https://bugzilla.gnome.org/show_bug.cgi?id=652127 is fixed, we 
+# Until bug https://bugzilla.gnome.org/show_bug.cgi?id=652127 is fixed, we
 # need to reimplement inspect.getmembers.  GObject introspection doesn't
 # play nice with it.
 def getmembers(obj, check):
@@ -285,13 +284,13 @@
                 handler_names.append("on_%s" % sig)
 
             do_connect(item, sig, handler_names,
-             callback_handler_dict, builder.connections)
+                       callback_handler_dict, builder.connections)
 
     log_unconnected_functions(callback_handler_dict, builder.connections)
 
 
 def do_connect(item, signal_name, handler_names,
-        callback_handler_dict, connections):
+               callback_handler_dict, connections):
     '''connect this signal to an unused handler'''
     widget_name, widget = item
 
@@ -304,7 +303,7 @@
             connections.append(connection)
 
             logger.debug("connect builder by name '%s','%s', '%s'",
-             widget_name, signal_name, handler_name)
+                         widget_name, signal_name, handler_name)
 
 
 def log_unconnected_functions(callback_handler_dict, connections):

=== modified file 'accomplishments_viewer_lib/PreferencesDialog.py'
--- accomplishments_viewer_lib/PreferencesDialog.py	2012-09-07 18:19:02 +0000
+++ accomplishments_viewer_lib/PreferencesDialog.py	2012-11-26 16:03:25 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -19,19 +19,20 @@
 """this dialog adjusts values in gsettings
 """
 
-from gi.repository import Gtk # pylint: disable=E0611
+from gi.repository import Gtk  # pylint: disable=E0611
 import logging
 logger = logging.getLogger('accomplishments_viewer_lib')
 
 from . helpers import get_builder, show_uri, get_help_uri
 
+
 class PreferencesDialog(Gtk.Dialog):
     __gtype_name__ = "PreferencesDialog"
 
     def __new__(cls):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
-        
+
         Returns a fully instantiated PreferencesDialog object.
         """
         builder = get_builder('PreferencesAccomplishmentsViewerDialog')
@@ -46,7 +47,7 @@
         and creating a PreferencesDialog object with it in order to
         finish initializing the start of the new PerferencesAccomplishmentsViewerDialog
         instance.
-        
+
         Put your initialization code in here and leave __init__ undefined.
         """
 
@@ -61,4 +62,3 @@
 
     def on_btn_help_clicked(self, widget, data=None):
         show_uri(self, "ghelp:%s" % get_help_uri('preferences'))
-

=== modified file 'accomplishments_viewer_lib/Window.py'
--- accomplishments_viewer_lib/Window.py	2012-09-07 18:19:02 +0000
+++ accomplishments_viewer_lib/Window.py	2012-11-26 16:03:25 +0000
@@ -1,33 +1,34 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
 ### DO NOT EDIT THIS FILE ###
 
-from gi.repository import Gio, Gtk # pylint: disable=E0611
+from gi.repository import Gio, Gtk  # pylint: disable=E0611
 import logging
 logger = logging.getLogger('accomplishments_viewer_lib')
 
 from . helpers import get_builder, show_uri, get_help_uri
 
+
 # This class is meant to be subclassed by AccomplishmentsViewerWindow.  It provides
 # common functions and some boilerplate.
 class Window(Gtk.Window):
     __gtype_name__ = "Window"
 
-    # To construct a new instance of this method, the following notable 
+    # To construct a new instance of this method, the following notable
     # methods are called in this order:
     # __new__(cls)
     # __init__(self)
@@ -36,11 +37,11 @@
     #
     # For this reason, it's recommended you leave __init__ empty and put
     # your initialization code in finish_initializing
-    
+
     def __new__(cls):
-        """Special static method that's automatically called by Python when 
+        """Special static method that's automatically called by Python when
         constructing a new instance of this class.
-        
+
         Returns a fully instantiated BaseAccomplishmentsViewerWindow object.
         """
         builder = get_builder('AccomplishmentsViewerWindow')
@@ -58,9 +59,9 @@
         # Get a reference to the builder and set up the signals.
         self.builder = builder
         self.ui = builder.get_ui(self, True)
-        self.PreferencesDialog = None # class
-        self.preferences_dialog = None # instance
-        self.AboutDialog = None # class
+        self.PreferencesDialog = None  # class
+        self.preferences_dialog = None  # instance
+        self.AboutDialog = None  # class
 
         self.settings = Gio.Settings("net.launchpad.accomplishments-viewer")
         self.settings.connect('changed', self.on_preferences_changed)
@@ -84,7 +85,7 @@
     def on_mnu_about_activate(self, widget, data=None):
         """Display the about box for accomplishments-viewer."""
         if self.AboutDialog is not None:
-            about = self.AboutDialog() # pylint: disable=E1102
+            about = self.AboutDialog()  # pylint: disable=E1102
             response = about.run()
             about.destroy()
 
@@ -101,7 +102,7 @@
             self.preferences_dialog.present()
         elif self.PreferencesDialog is not None:
             logger.debug('create new preferences_dialog')
-            self.preferences_dialog = self.PreferencesDialog() # pylint: disable=E1102
+            self.preferences_dialog = self.PreferencesDialog()  # pylint: disable=E1102
             self.preferences_dialog.connect('destroy', self.on_preferences_dialog_destroyed)
             self.preferences_dialog.show()
         # destroy command moved into dialog to allow for a help button
@@ -120,7 +121,7 @@
 
     def on_preferences_dialog_destroyed(self, widget, data=None):
         '''only affects gui
-        
+
         logically there is no difference between the user closing,
         minimising or ignoring the preferences dialog'''
         logger.debug('on_preferences_dialog_destroyed')

=== modified file 'accomplishments_viewer_lib/__init__.py'
--- accomplishments_viewer_lib/__init__.py	2012-09-07 18:19:02 +0000
+++ accomplishments_viewer_lib/__init__.py	2012-11-26 16:03:25 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -22,4 +22,3 @@
 from . helpers import set_up_logging
 from . Window import Window
 from . accomplishments_viewerconfig import get_version
-

=== modified file 'accomplishments_viewer_lib/accomplishments_viewerconfig.py'
--- accomplishments_viewer_lib/accomplishments_viewerconfig.py	2012-09-07 18:19:02 +0000
+++ accomplishments_viewer_lib/accomplishments_viewerconfig.py	2012-11-26 16:03:25 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -20,7 +20,7 @@
     'project_path_not_found',
     'get_data_file',
     'get_data_path',
-    ]
+]
 
 # Where your project will look for your data (for instance, images and ui
 # files). By default, this is ../data, relative your trunk layout
@@ -30,7 +30,6 @@
 
 import os
 
-from locale import gettext as _
 
 class project_path_not_found(Exception):
     """Raised when we can't find the project directory."""

=== modified file 'accomplishments_viewer_lib/helpers.py'
--- accomplishments_viewer_lib/helpers.py	2012-09-07 18:19:02 +0000
+++ accomplishments_viewer_lib/helpers.py	2012-11-26 16:03:25 +0000
@@ -1,16 +1,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -25,10 +25,11 @@
 
 from locale import gettext as _
 
+
 def get_builder(builder_file_name):
-    """Return a fully-instantiated Gtk.Builder instance from specified ui 
+    """Return a fully-instantiated Gtk.Builder instance from specified ui
     file
-    
+
     :param builder_file_name: The name of the builder file, without extension.
         Assumed to be in the 'ui' directory under the data path.
     """
@@ -49,12 +50,14 @@
     if not os.path.exists(media_filename):
         media_filename = None
 
-    return "file:///"+media_filename
+    return "file:///" + media_filename
+
 
 class NullHandler(logging.Handler):
     def emit(self, record):
         pass
 
+
 def set_up_logging(opts):
     # add a handler to prevent basicConfig
     root = logging.getLogger()
@@ -80,6 +83,7 @@
     if opts.verbose > 1:
         lib_logger.setLevel(logging.DEBUG)
 
+
 def get_help_uri(page=None):
     # help_uri from source tree - default language
     here = os.path.dirname(__file__)
@@ -95,11 +99,13 @@
 
     return help_uri
 
+
 def show_uri(parent, link):
-    from gi.repository import Gtk # pylint: disable=E0611
+    from gi.repository import Gtk  # pylint: disable=E0611
     screen = parent.get_screen()
     Gtk.show_uri(screen, link, Gtk.get_current_event_time())
 
+
 def alias(alternative_function_name):
     '''see http://www.drdobbs.com/web-development/184406073#l9'''
     def decorator(function):

=== modified file 'bin/accomplishments-viewer'
--- bin/accomplishments-viewer	2012-09-07 18:19:02 +0000
+++ bin/accomplishments-viewer	2012-11-26 16:03:25 +0000
@@ -2,16 +2,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -30,18 +30,18 @@
 python_path = []
 if os.path.abspath(__file__).startswith('/opt'):
     locale.bindtextdomain('accomplishments-viewer', '/opt/extras.ubuntu.com/accomplishments-viewer/share/locale')
-    syspath = sys.path[:] # copy to avoid infinite loop in pending objects
+    syspath = sys.path[:]  # copy to avoid infinite loop in pending objects
     for path in syspath:
         opt_path = path.replace('/usr', '/opt/extras.ubuntu.com/accomplishments-viewer')
         python_path.insert(0, opt_path)
         sys.path.insert(0, opt_path)
     os.putenv("XDG_DATA_DIRS", "%s:%s" % ("/opt/extras.ubuntu.com/accomplishments-viewer/share/", os.getenv("XDG_DATA_DIRS", "/usr/local/share/:/usr/share/")))
 if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'accomplishments_viewer'))
-    and PROJECT_ROOT_DIRECTORY not in sys.path):
+        and PROJECT_ROOT_DIRECTORY not in sys.path):
     python_path.insert(0, PROJECT_ROOT_DIRECTORY)
     sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
 if python_path:
-    os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses
+    os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path)))  # for subprocesses
 
 import accomplishments_viewer
 accomplishments_viewer.main()

=== modified file 'tests/test_example.py'
--- tests/test_example.py	2012-09-07 18:40:05 +0000
+++ tests/test_example.py	2012-11-26 16:03:25 +0000
@@ -2,16 +2,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -22,10 +22,13 @@
 
 from accomplishments_viewer import AboutAccomplishmentsViewerDialog
 
+
 class TestExample(unittest.TestCase):
     def setUp(self):
         self.AboutAccomplishmentsViewerDialog_members = [
-        'AboutAccomplishmentsViewerDialog', 'AboutDialog', 'dbusapi', 'gettext', 'locale', 'locale_dir', 'logger', 'logging']
+            'AboutAccomplishmentsViewerDialog', 'AboutDialog', 'dbusapi',
+            'gettext', 'locale', 'locale_dir', 'logger', 'logging'
+        ]
 
     def test_AboutAccomplishmentsViewerDialog_members(self):
         all_members = dir(AboutAccomplishmentsViewerDialog)
@@ -33,5 +36,5 @@
         public_members.sort()
         self.assertEqual(self.AboutAccomplishmentsViewerDialog_members, public_members)
 
-if __name__ == '__main__':    
+if __name__ == '__main__':
     unittest.main()

=== modified file 'tests/test_lint.py'
--- tests/test_lint.py	2012-09-07 18:19:02 +0000
+++ tests/test_lint.py	2012-11-26 16:03:25 +0000
@@ -2,16 +2,16 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 ### BEGIN LICENSE
 # Copyright (C) 2012 Jono Bacon <[e-mail]>
-# This program is free software: you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License version 3, as published 
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it will be useful, but 
-# WITHOUT ANY WARRANTY; without even the implied warranties of 
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
 # PURPOSE.  See the GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License along 
+#
+# You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 ### END LICENSE
 
@@ -21,17 +21,17 @@
 class TestPylint(unittest.TestCase):
     def test_project_errors_only(self):
         '''run pylint in error only mode
-        
+
         your code may well work even with pylint errors
         but have some unusual code'''
         return_code = subprocess.call(["pylint", '-E', 'accomplishments_viewer'])
         # not needed because nosetests displays pylint console output
         #self.assertEqual(return_code, 0)
 
-    # un-comment the following for loads of diagnostics   
+    # un-comment the following for loads of diagnostics
     #~ def test_project_full_report(self):
         #~ '''Only for the brave
-#~ 
+#~
         #~ you will have to make judgement calls about your code standards
         #~ that differ from the norm'''
         #~ return_code = subprocess.call(["pylint", 'accomplishments_viewer'])