Pep8 corrections in readdialog.py, readsidebar.py and readtopbar.py

3 files changed, 37 insertions, 23 deletions

diff --git a/readdialog.py b/readdialog.py
index 61d5672..bc8b822 100644
--- a/readdialog.py
+++ b/readdialog.py
@@ -95,7 +95,8 @@ class BaseReadDialog(gtk.Window):
 
 
 class BookmarkDialog(BaseReadDialog):
-    def __init__(self, parent_xid, dialog_title, bookmark_title, bookmark_content, page, sidebarinstance):
+    def __init__(self, parent_xid, dialog_title, bookmark_title,
+            bookmark_content, page, sidebarinstance):
         BaseReadDialog.__init__(self, parent_xid, dialog_title)
 
         self._sidebarinstance = sidebarinstance
@@ -162,26 +163,32 @@ class BookmarkDialog(BaseReadDialog):
 
 class BookmarkAddDialog(BookmarkDialog):
 
-    def __init__(self, parent_xid, dialog_title, bookmark_title, bookmark_content, page, sidebarinstance):
-        BookmarkDialog.__init__(self, parent_xid, dialog_title, bookmark_title, bookmark_content, page, sidebarinstance)
+    def __init__(self, parent_xid, dialog_title, bookmark_title,
+            bookmark_content, page, sidebarinstance):
+        BookmarkDialog.__init__(self, parent_xid, dialog_title, bookmark_title,
+            bookmark_content, page, sidebarinstance)
 
     def accept_clicked_cb(self, widget):
         title = self._title_entry.get_text()
         details = self._content_entry.get_buffer().props.text
         content = {'title': unicode(title), 'body': unicode(details)}
-        self._sidebarinstance._real_add_bookmark(self._page, cjson.encode(content))
+        self._sidebarinstance._real_add_bookmark(self._page,
+                cjson.encode(content))
         self.destroy()
 
 
 class BookmarkEditDialog(BookmarkDialog):
 
-    def __init__(self, parent_xid, dialog_title, bookmark_title, bookmark_content, page, sidebarinstance):
-        BookmarkDialog.__init__(self, parent_xid, dialog_title, bookmark_title, bookmark_content, page, sidebarinstance)
+    def __init__(self, parent_xid, dialog_title, bookmark_title,
+            bookmark_content, page, sidebarinstance):
+        BookmarkDialog.__init__(self, parent_xid, dialog_title, bookmark_title,
+            bookmark_content, page, sidebarinstance)
 
     def accept_clicked_cb(self, widget):
         title = self._title_entry.get_text()
         details = self._content_entry.get_buffer().props.text
         content = {'title': unicode(title), 'body': unicode(details)}
         self._sidebarinstance.del_bookmark(self._page)
-        self._sidebarinstance._real_add_bookmark(self._page, cjson.encode(content))
+        self._sidebarinstance._real_add_bookmark(self._page,
+                cjson.encode(content))
         self.destroy()
diff --git a/readsidebar.py b/readsidebar.py
index 041b478..b4db2bc 100644
--- a/readsidebar.py
+++ b/readsidebar.py
@@ -34,7 +34,8 @@ from gettext import gettext as _
 
 _logger = logging.getLogger('read-activity')
 
-#TODO: Add support for multiple bookmarks in a single page (required when sharing)
+# TODO: Add support for multiple bookmarks in a single page
+# (required when sharing)
 
 
 class Sidebar(gtk.EventBox):
@@ -66,8 +67,8 @@ class Sidebar(gtk.EventBox):
 
         self._bookmark_icon.props.has_tooltip = True
         self.__bookmark_icon_query_tooltip_cb_id = \
-            self._bookmark_icon.connect('query_tooltip', self.__bookmark_icon_query_tooltip_cb, \
-                bookmark)
+            self._bookmark_icon.connect('query_tooltip',
+            self.__bookmark_icon_query_tooltip_cb, bookmark)
 
         self.__event_cb_id = \
             self.connect('event', self.__event_cb, bookmark)
@@ -78,13 +79,15 @@ class Sidebar(gtk.EventBox):
         if bookmark.is_local():
             self._is_showing_local_bookmark = True
 
-    def __bookmark_icon_query_tooltip_cb(self, widget, x, y, keyboard_mode, tip, bookmark):
+    def __bookmark_icon_query_tooltip_cb(self, widget, x, y, keyboard_mode,
+            tip, bookmark):
         tooltip_header = bookmark.get_note_title()
         tooltip_body = bookmark.get_note_body()
-        #TRANS: This goes like Bookmark added by User 5 days ago (the elapsed string gets translated
-        #TRANS: automatically)
+        #TRANS: This goes like Bookmark added by User 5 days ago
+        #TRANS: (the elapsed string gets translated automatically)
         tooltip_footer = (_('Bookmark added by %(user)s %(time)s') \
-                % {'user': bookmark.nick, 'time': timestamp_to_elapsed_string(bookmark.timestamp)})
+                % {'user': bookmark.nick,
+                'time': timestamp_to_elapsed_string(bookmark.timestamp)})
 
         vbox = gtk.VBox()
 
@@ -135,10 +138,11 @@ class Sidebar(gtk.EventBox):
 
     def _clear_bookmarks(self):
         if self._bookmark_icon is not None:
-            self._bookmark_icon.disconnect(self.__bookmark_icon_query_tooltip_cb_id)
+            self._bookmark_icon.disconnect(
+                    self.__bookmark_icon_query_tooltip_cb_id)
             self.disconnect(self.__event_cb_id)
 
-            self._bookmark_icon.hide() #XXX: Is this needed??
+            self._bookmark_icon.hide()  # XXX: Is this needed??
             self._bookmark_icon.destroy()
 
             self._bookmark_icon = None
diff --git a/readtopbar.py b/readtopbar.py
index 9725525..93b15b9 100644
--- a/readtopbar.py
+++ b/readtopbar.py
@@ -16,7 +16,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import gtk, gobject
+import gtk
+import gobject
 import dbus
 import logging
 
@@ -57,7 +58,8 @@ class _TopBar(gtk.HBox):
 
             for device_path in upower.EnumerateDevices():
                 device = bus.get_object('org.freedesktop.UPower', device_path)
-                device_prop_iface = dbus.Interface(device, dbus.PROPERTIES_IFACE)
+                device_prop_iface = dbus.Interface(device,
+                        dbus.PROPERTIES_IFACE)
                 device_type = device_prop_iface.Get(_UP_DEVICE_IFACE, 'Type')
                 if device_type != _UP_TYPE_BATTERY:
                     continue
@@ -79,13 +81,13 @@ class _TopBar(gtk.HBox):
         if property.name == 'completion-level':
             return self._completion_level
         else:
-            raise AttributeError, 'unknown property %s' % property.name
+            raise AttributeError('unknown property %s' % property.name)
 
     def do_set_property(self, property, value):
         if property.name == 'completion-level':
             self.set_completion_level(value)
         else:
-            raise AttributeError, 'unknown property %s' % property.name
+            raise AttributeError('unknown property %s' % property.name)
 
     def set_completion_level(self, value):
         self._completion_level = value
@@ -131,8 +133,9 @@ class TopBar(_TopBar):
     def _page_changed_cb(self, model, page_from, page_to):
         current_page = self._view.get_current_page()
         n_pages = self._view.get_pagecount()
-
-        self.set_completion_level(int(float(current_page) * 100 / float(n_pages)))
+        completion_level = int(float(current_page) * 100 / float(n_pages))
+        self.set_completion_level(completion_level)
 
         #TRANS: Translate this as Page i of m (eg: Page 4 of 334)
-        self._progressbar.set_text(_("Page %i of %i") % (current_page, n_pages))
+        self._progressbar.set_text(
+                _("Page %i of %i") % (current_page, n_pages))