pep8 cleanup: fix whitespace

Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>

6 files changed, 40 insertions, 46 deletions

diff --git a/epubview/epub.py b/epubview/epub.py
index 86f6ec9..9a05abf 100644
--- a/epubview/epub.py
+++ b/epubview/epub.py
@@ -61,7 +61,6 @@ class _Epub(object):
                 self._zobject.extract(name)
         os.chdir(orig_cwd)
 
-
     def _get_opf(self):
         containerfile = self._zobject.open('META-INF/container.xml')
 
@@ -79,7 +78,6 @@ class _Epub(object):
 
         containerfile.close()
 
-
     def _get_ncx(self):
         opffile = self._zobject.open(self._opfpath)
 
diff --git a/epubview/epubinfo.py b/epubview/epubinfo.py
index 27cfe3e..f781c25 100644
--- a/epubview/epubinfo.py
+++ b/epubview/epubinfo.py
@@ -17,7 +17,6 @@ class EpubInfo(): #TODO: Cover the entire DC range
         self.identifier = self._get_identifier()
         self.language = self._get_language()
 
-
     def _get_data(self, tagname):
         element = self._e_metadata.find(tagname)
         return element.text
@@ -67,7 +66,7 @@ class EpubInfo(): #TODO: Cover the entire DC range
         element = self._e_metadata.find('.//{http://purl.org/dc/elements/1.1/}identifier')
 
         if element is not None:
-            return {'id':element.get('id'), 'value':element.text}
+            return {'id': element.get('id'), 'value': element.text}
         else:
             return None
 
diff --git a/epubview/epubview.py b/epubview/epubview.py
index e9cc276..31acb3f 100644
--- a/epubview/epubview.py
+++ b/epubview/epubview.py
@@ -33,20 +33,21 @@ LOADING_HTML = '''
 </div>
 '''
 
+
 class _View(gtk.HBox):
+
     __gproperties__ = {
-        'has-selection' : (gobject.TYPE_BOOLEAN, 'whether has selection',
-                  'whether the widget has selection or not',
-                  0, gobject.PARAM_READABLE),
-    'zoom' : (gobject.TYPE_FLOAT, 'the zoom level',
-                  'the zoom level of the widget',
-                  0.5, 4.0, 1.0, gobject.PARAM_READWRITE)
+        'has-selection': (gobject.TYPE_BOOLEAN, 'whether has selection',
+                          'whether the widget has selection or not',
+                          0, gobject.PARAM_READABLE),
+        'zoom': (gobject.TYPE_FLOAT, 'the zoom level',
+                 'the zoom level of the widget',
+                 0.5, 4.0, 1.0, gobject.PARAM_READWRITE),
     }
     __gsignals__ = {
-        'page-changed': (gobject.SIGNAL_RUN_FIRST,
-                          gobject.TYPE_NONE,
-                          ([]))
+        'page-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
     }
+
     def __init__(self):
         gobject.threads_init()
         gtk.HBox.__init__(self)
@@ -92,10 +93,10 @@ class _View(gtk.HBox):
         self._scrollbar.set_update_policy(gtk.UPDATE_DISCONTINUOUS)
         self._scrollbar_change_value_cb_id = self._scrollbar.connect('change-value', \
                                                                       self._scrollbar_change_value_cb)
-        self.pack_start(self._sw, expand = True, fill = True)
-        self.pack_start(self._scrollbar, expand = False, fill = False)
+        self.pack_start(self._sw, expand=True, fill=True)
+        self.pack_start(self._scrollbar, expand=False, fill=False)
 
-        self._view.set_flags(gtk.CAN_DEFAULT|gtk.CAN_FOCUS)
+        self._view.set_flags(gtk.CAN_DEFAULT | gtk.CAN_FOCUS)
 
     def set_document(self, epubdocumentinstance):
         '''
@@ -367,7 +368,7 @@ class _View(gtk.HBox):
 
         remfactor = self._paginator.get_remfactor_for_file(filename)
         pages = self._paginator.get_pagecount_for_file(filename)
-        extra = int(math.ceil(remfactor * self._view.get_page_height()/(pages-remfactor)))
+        extra = int(math.ceil(remfactor * self._view.get_page_height() / (pages - remfactor)))
         if extra > 0:
             self._view.add_bottom_padding(extra)
 
@@ -390,13 +391,12 @@ class _View(gtk.HBox):
         if scroll_upper == 0: # This is a one page file
             pageno = base_pageno
         else:
-            offset = (scrollval/scroll_upper) * self._paginator.get_pagecount_for_file(filename)
+            offset = (scrollval / scroll_upper) * self._paginator.get_pagecount_for_file(filename)
             pageno = math.floor(base_pageno + offset)
 
         if pageno != self._loaded_page:
             self._on_page_changed(int(pageno))
 
-
     def _scroll_page_end(self):
         v_upper = self._v_vscrollbar.props.adjustment.props.upper
         v_page_size = self._v_vscrollbar.props.adjustment.props.page_size
@@ -439,7 +439,7 @@ class _View(gtk.HBox):
 
             scrollfactor_next = self._paginator.get_scrollfactor_pos_for_pageno(self._loaded_page + 1)
             if scrollval > 0:
-                scrollfactor = scrollval/(scroll_upper - scroll_page_size)
+                scrollfactor = scrollval / (scroll_upper - scroll_page_size)
             else:
                 scrollfactor = 0
             if scrollfactor >= scrollfactor_next:
@@ -451,7 +451,7 @@ class _View(gtk.HBox):
 
             scrollfactor_cur = self._paginator.get_scrollfactor_pos_for_pageno(self._loaded_page)
             if scrollval > 0:
-                scrollfactor = scrollval/(scroll_upper - scroll_page_size)
+                scrollfactor = scrollval / (scroll_upper - scroll_page_size)
             else:
                 scrollfactor = 0
 
@@ -556,8 +556,5 @@ class _View(gtk.HBox):
         if self._loaded_page < 1:
             self._load_page(1)
 
-
-
     def _destroy_cb(self, widget):
         self._epub.close()
-
diff --git a/epubview/jobs.py b/epubview/jobs.py
index 6fe5b25..8dc26c7 100644
--- a/epubview/jobs.py
+++ b/epubview/jobs.py
@@ -32,19 +32,21 @@ import threading
 PAGE_WIDTH = 135
 PAGE_HEIGHT = 216
 
+
 def _pixel_to_mm(pixel, dpi):
-    inches = pixel/dpi
-    return int(inches/0.03937)
+    inches = pixel / dpi
+    return int(inches / 0.03937)
+
 
 def _mm_to_pixel(mm, dpi):
     inches = mm * 0.03937
     return int(inches * dpi)
 
 
-
 class SearchThread(threading.Thread):
+
     def __init__(self, obj):
-        threading.Thread.__init__ (self)
+        threading.Thread.__init__(self)
         self.obj = obj
         self.stopthread = threading.Event()
 
@@ -76,20 +78,19 @@ class SearchThread(threading.Thread):
 
         return False
 
-    def run (self):
+    def run(self):
         self._start_search()
 
     def stop(self):
         self.stopthread.set()
 
 
-
 class _JobPaginator(gobject.GObject):
+
     __gsignals__ = {
-        'paginated': (gobject.SIGNAL_RUN_FIRST,
-                          gobject.TYPE_NONE,
-                          ([]))
+        'paginated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
     }
+
     def __init__(self, filelist):
         gobject.GObject.__init__(self)
 
@@ -145,19 +146,19 @@ class _JobPaginator(gobject.GObject):
         if pageheight <= _mm_to_pixel(PAGE_HEIGHT, self._dpi):
             pages = 1
         else:
-            pages = pageheight/float(_mm_to_pixel(PAGE_HEIGHT, self._dpi))
+            pages = pageheight / float(_mm_to_pixel(PAGE_HEIGHT, self._dpi))
         for i in range(1, int(math.ceil(pages) + 1)):
             if pages - i < 0:
-                pagelen = (pages - math.floor(pages))/pages
+                pagelen = (pages - math.floor(pages)) / pages
             else:
-                pagelen = 1/pages
-            self._pagemap[float(self._pagecount + i)] = (f.props.uri, (i-1)/math.ceil(pages), pagelen)
+                pagelen = 1 / pages
+            self._pagemap[float(self._pagecount + i)] = (f.props.uri, (i - 1) / math.ceil(pages), pagelen)
 
         self._pagecount += math.ceil(pages)
         self._filedict[f.props.uri.replace('file://', '')] = (math.ceil(pages), math.ceil(pages) - pages)
         self._bookheight += pageheight
 
-        if self._count+1 >= len(self._filelist):
+        if self._count + 1 >= len(self._filelist):
             self._temp_win.destroy()
             self._screen.set_font_options(self._old_fontoptions)
             self.emit('paginated')
@@ -165,7 +166,6 @@ class _JobPaginator(gobject.GObject):
             self._count += 1
             self._temp_view.open(self._filelist[self._count])
 
-
     def get_file_for_pageno(self, pageno):
         '''
         Returns the file in which pageno occurs
@@ -221,10 +221,9 @@ class _JobPaginator(gobject.GObject):
 
 class _JobFind(gobject.GObject):
     __gsignals__ = {
-        'updated': (gobject.SIGNAL_RUN_FIRST,
-                          gobject.TYPE_NONE,
-                          ([]))
+        'updated': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([])),
     }
+
     def __init__(self, document, start_page, n_pages, text, case_sensitive=False):
         gobject.GObject.__init__(self)
         gtk.gdk.threads_init()
diff --git a/epubview/navmap.py b/epubview/navmap.py
index 314752a..ac479cd 100644
--- a/epubview/navmap.py
+++ b/epubview/navmap.py
@@ -1,8 +1,10 @@
 from lxml import etree
 import gtk
 
+
 class NavPoint(object):
-    def __init__(self, label, contentsrc, children = []):
+
+    def __init__(self, label, contentsrc, children=[]):
         self._label = label
         self._contentsrc = contentsrc
         self._children = children
@@ -59,7 +61,7 @@ class NavMap(object):
         text = navpoint.find('./{http://www.daisy.org/z3986/2005/ncx/}content/')
         return self._basepath + text.get('src')
 
-    def _process_navpoint(self, navpoint, parent = None):
+    def _process_navpoint(self, navpoint, parent=None):
         title = self._gettitle(navpoint)
         content = self._getcontent(navpoint)
 
@@ -72,7 +74,7 @@ class NavMap(object):
 
         if len(childnavpointlist):
             for childnavpoint in childnavpointlist:
-                self._process_navpoint(childnavpoint, parent = iter)
+                self._process_navpoint(childnavpoint, parent=iter)
         else:
             return
 
diff --git a/epubview/widgets.py b/epubview/widgets.py
index 0458573..7ab1585 100644
--- a/epubview/widgets.py
+++ b/epubview/widgets.py
@@ -28,4 +28,3 @@ class _WebView(webkit.WebView):
         '''
         js = ('var newdiv = document.createElement("div");newdiv.style.height = "%dpx";document.body.appendChild(newdiv);' % incr)
         self.execute_script(js)
-