Code clarity fixes

autopep8 -ir -j2 --select=E303,E125
Diff checked manually.

contrib/downloadboob/downloadboob.py

@@ -136,7 +136,6 @@ class Downloadboob:
 
         return u"%s/%s.%s" % (directory, removeNonAscii(video.id), ext)
 
-
     def get_linkname(self, video):
         if not os.path.exists(self.links_directory):
             os.makedirs(self.links_directory)
@@ -151,12 +150,10 @@ class Downloadboob:
 
         return u"%s/%s (%s).%s" % (self.links_directory, removeSpecial(video.title), removeSpecial(misc), ext)
 
-
     def is_downloaded(self, video):
         # check if the file is 0 byte
         return os.path.isfile(self.get_filename(video))
 
-
     def remove_download(self, video):
         path = self.get_filename(video)
         if os.stat(path).st_size == 0:
@@ -169,7 +166,6 @@ class Downloadboob:
         with open(path, 'w'):
             pass
 
-
     def set_linkname(self, video):
         linkname = self.get_linkname(video)
         idname = self.get_filename(video, relative=True)
@@ -178,7 +174,6 @@ class Downloadboob:
             print "%s -> %s" % (linkname, idname)
             os.symlink(idname, linkname)
 
-
     def do_download(self, video):
         if not video:
             print >>sys.stderr, 'Video not found: %s' %  video

modules/bnporc/perso/login.py

@@ -61,7 +61,6 @@ class BNPVirtKeyboard(MappedVirtKeyboard):
         return code
 
 
-
 class LoginPage(BasePage):
     def on_loaded(self):
         for td in self.document.getroot().cssselect('td.LibelleErreur'):
@@ -128,7 +127,6 @@ class ChangePasswordPage(BasePage):
 
         cookiejar.set_cookie(c)
 
-
         code_current=vk.get_string_code(current)
         code_new=vk.get_string_code(new)
 

modules/boursorama/pages/account_history.py

@@ -27,7 +27,6 @@ from weboob.tools.browser import BasePage
 from weboob.tools.capabilities.bank.transactions import FrenchTransaction
 
 
-
 __all__ = ['AccountHistory']
 
 class Transaction(FrenchTransaction):

modules/cmb/backend.py

@@ -45,7 +45,6 @@ from hellhttp import HellHTTPS
 __all__ = ['CmbBackend']
 
 
-
 class CmbBackend(BaseBackend, ICapBank):
     NAME = 'cmb'
     MAINTAINER = u'Johann Broudin'
@@ -98,8 +97,6 @@ class CmbBackend(BaseBackend, ICapBank):
             )
             ]
 
-
-
     cookie = None
     headers = {
             'User-Agent':
@@ -197,7 +194,6 @@ class CmbBackend(BaseBackend, ICapBank):
                 account._cmbvaleur2 = m.group(2)
                 account._cmbtype = m.group(3)
 
-
                 balance = u''.join([txt.strip() for txt in td[2].itertext()])
                 balance = balance.replace(',', '.').replace(u"\xa0", '')
                 account.balance = Decimal(balance)
@@ -252,7 +248,6 @@ class CmbBackend(BaseBackend, ICapBank):
         parser = etree.HTMLParser()
         tree = etree.parse(StringIO(data), parser)
 
-
         tables = tree.xpath('/html/body/table')
         if len(tables) == 0:
             title = tree.xpath('/html/head/title')[0].text
@@ -275,7 +270,7 @@ class CmbBackend(BaseBackend, ICapBank):
                 continue
             for tr in table.getiterator('tr'):
                 if (tr.get('class') != 'LnTit' and
-                    tr.get('class') != 'LnTot'):
+                        tr.get('class') != 'LnTot'):
                     operation = Transaction(i)
                     td = tr.xpath('td')
 

modules/cmb/hellhttp.py

@@ -34,7 +34,6 @@ class HTTPSVerifiedConnection(httplib.HTTPSConnection):
     This class allows communication via SSL, and will checks certificates
     """
 
-
     def __init__(self, host, port=None, key_file=None, cert_file=None,
                  ca_file=None, strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
                  callBack=None):

modules/creditcooperatif/pro/pages.py

@@ -159,7 +159,6 @@ class ComingTransactionsPage(BasePage):
             else:
                 date += "/%d" % time.localtime().tm_year
 
-
             t = Transaction(date+""+raw)
             t.parse(date, re.sub(r'[ ]+', ' ', raw))
             t.set_amount("", debit)

modules/dresdenwetter/pages.py

@@ -30,7 +30,6 @@ class StartPage(BasePage):
             u"Niederschlag", u"Globalstrahlung", u"Schneehoehe"]
     unit = [u"°C", u"km/h", u"hPa", u"%", u"mm", u"W/m²", u"cm"]
 
-
     def get_sensors_list(self):
         paraphs = self.document.xpath('//p[@align="center"]')
         sensors = []

modules/europarl/pages.py

@@ -32,7 +32,6 @@ from weboob.tools.browser import BrokenPageError
 from .video import EuroparlVideo
 
 
-
 __all__ = ['VideoPage']
 
 class VideoPage(BasePage):

modules/gdcvault/pages.py

@@ -35,8 +35,6 @@ from .video import GDCVaultVideo
 #import lxml.etree
 
 
-
-
 __all__ = ['VideoPage']
 
 class VideoPage(BasePage):

modules/googletranslate/backend.py

@@ -48,7 +48,6 @@ class GoogleTranslateBackend(BaseBackend, ICapTranslate):
         'Telugu':'te', 'Thai':'th', 'Turkish':'tr', 'Ukrainian':'uk', 'Urdu':'ur', 'Vietnamese':'vi', 'Welsh':'cy', 'Yiddish':'yi',
         }
 
-
     def translate(self, lan_from, lan_to, text):
         if not lan_from in self.GOOGLELANGUAGE.keys():
             raise LanguageNotSupported()

modules/ing/pages/login.py

@@ -103,7 +103,6 @@ class LoginPage(BasePage):
         err = self.document.find('//span[@class="error"]')
         return err is not None
 
-
     def login(self, password):
         # 2) And now, the virtual Keyboard
         try:

modules/inrocks/browser.py

@@ -23,7 +23,6 @@ from .pages.inrockstv import InrocksTvPage
 from weboob.tools.browser import BaseBrowser
 
 
-
 class NewspaperInrocksBrowser(BaseBrowser):
     "NewspaperInrocksBrowser class"
     PAGES = {

modules/marmiton/pages.py

@@ -55,7 +55,6 @@ class ResultsPage(BasePage):
                 yield recipe
                     
 
-
 class RecipePage(BasePage):
     """ Page which contains a recipe
     """

modules/newsfeed/backend.py

@@ -37,7 +37,6 @@ class NewsfeedBackend(BaseBackend, ICapMessages):
     CONFIG = BackendConfig(Value('url', label="Atom/RSS feed's url", regexp='https?://.*'))
     STORAGE = {'seen': []}
 
-
     def iter_threads(self):
         for article in Newsfeed(self.config['url'].get()).iter_entries():
             yield self.get_thread(article.id, article)
@@ -75,15 +74,12 @@ class NewsfeedBackend(BaseBackend, ICapMessages):
                               flags=flags)
         return thread
 
-
-
     def iter_unread_messages(self):
         for thread in self.iter_threads():
             for m in thread.iter_all_messages():
                 if m.flags & m.IS_UNREAD:
                     yield m
 
-
     def set_message_read(self, message):
         self.storage.get('seen', default=[]).append(message.thread.id)
         self.storage.save()

modules/okc/browser.py

@@ -44,7 +44,6 @@ class OkCBrowser(BaseBrowser):
             ('http://%s/profile/[^/]*' % DOMAIN, ProfilePage),
     ))
 
-
     logged_in = False
 
     def home(self):

modules/opacwebaloes/browser.py

@@ -60,7 +60,7 @@ class AloesBrowser(BaseBrowser):
                           no_login=True)
         if  not self.page.login(self.username, self.password) or \
             not self.is_logged() or \
-            (self.is_on_page(LoginPage) and self.page.is_error()):
+                (self.is_on_page(LoginPage) and self.page.is_error()):
                 raise BrowserIncorrectPassword()
 
     def get_rented_books_list(self):

modules/opensubtitles/pages.py

@@ -101,7 +101,6 @@ class SubtitlesPage(BasePage):
             return subtitle
 
 
-
 class SubtitlePage(BasePage):
     """ Page which contains a single subtitle for a movie
     """

modules/parolesmania/test.py

@@ -36,7 +36,6 @@ class ParolesmaniaTest(BackendTest):
             assert full_lyr.artist
             assert full_lyr.content is not NotLoaded
 
-
     def test_search_artist(self):
         l_lyrics = list(self.backend.iter_lyrics('artist','boris'))
         for songlyrics in l_lyrics:

modules/parolesmusique/test.py

@@ -36,7 +36,6 @@ class ParolesmusiqueTest(BackendTest):
             assert full_lyr.artist
             assert full_lyr.content is not NotLoaded
 
-
     def test_search_artist(self):
         l_lyrics = list(self.backend.iter_lyrics('artist','boris'))
         for songlyrics in l_lyrics:

modules/redmine/pages/wiki.py

@@ -37,6 +37,5 @@ class WikiEditPage(BasePage):
         return wiki_form.xpath('div/input')[0].get('value')
 
 
-
 class WikiPage(BasePage):
     pass

modules/sachsen/backend.py

@@ -46,7 +46,7 @@ class SachsenLevelBackend(BaseBackend, ICapGauge):
             lowpattern = pattern.lower()
             for gauge in self.browser.get_rivers_list():
                 if lowpattern in gauge.name.lower()\
-                    or lowpattern in gauge.object.lower():
+                        or lowpattern in gauge.object.lower():
                     yield gauge
 
     def _get_gauge_by_id(self, id):

modules/seeklyrics/test.py

@@ -36,7 +36,6 @@ class SeeklyricsTest(BackendTest):
             assert full_lyr.artist
             assert full_lyr.content is not NotLoaded
 
-
     def test_search_artist(self):
         l_lyrics = list(self.backend.iter_lyrics('artist','boris vian'))
         for songlyrics in l_lyrics:

modules/sfr/pages/compose.py

@@ -24,7 +24,6 @@ from weboob.capabilities.messages import CantSendMessage
 from weboob.tools.browser import BasePage
 
 
-
 __all__ = ['ClosePage', 'ComposePage', 'ConfirmPage', 'SentPage']
 
 

modules/societegenerale/pages/accounts_list.py

@@ -171,7 +171,6 @@ class AccountHistory(BasePage):
                                                   sign=p['sign'][0],
                                                   src=p['src'][0])
 
-
     def _iter_transactions(self, doc, coming):
         t = None
         for i, tr in enumerate(self.parser.select(doc.getroot(), 'tr')):

modules/vimeo/pages.py

@@ -38,7 +38,6 @@ from weboob.tools.browser import BrokenPageError
 from .video import VimeoVideo
 
 
-
 __all__ = ['VideoPage']
 
 class VideoPage(BasePage):

modules/weather/test.py

@@ -23,7 +23,6 @@ from weboob.tools.test import BackendTest
 class WeatherTest(BackendTest):
     BACKEND = 'weather'
 
-
     def test_cities(self):
         paris = self.backend.iter_city_search('crappything&param=;drop database')
         self.assertTrue(len(list(paris)) == 0)

weboob/applications/boobathon/boobathon.py

@@ -764,7 +764,6 @@ class Boobathon(ReplApplication):
         print >>sys.stderr, "There isn't any task in progress."
         return 1
 
-
     def load_default_backends(self):
         """
         Overload a BaseApplication method.

weboob/applications/boobill/boobill.py

@@ -181,7 +181,6 @@ class Boobill(ReplApplication):
                 self.download_all(dest, names)
                 return
 
-
         if dest is None:
             for backend, bill in self.do('get_bill', id, backends=names):
                 dest = id + "." + bill.format
@@ -215,5 +214,4 @@ class Boobill(ReplApplication):
                             print >>sys.stderr, 'Unable to write bill in "%s": %s' % (dest, e)
                             return 1
 
-
         return

weboob/applications/cineoob/cineoob.py

@@ -559,7 +559,6 @@ class Cineoob(ReplApplication):
         self.format(subtitle)
         self.flush()
 
-
     def complete_getfile_subtitle(self, text, line, *ignored):
         args = line.split(' ', 2)
         if len(args) == 2:

weboob/applications/masstransit/masstransit.py

@@ -132,7 +132,6 @@ class MasstransitHildon():
         self.treestore = gtk.TreeStore(str, str, str, str, str)
         treeview = gtk.TreeView(self.treestore)
 
-
         treeview.append_column(
             gtk.TreeViewColumn(
                 'Train',
@@ -166,8 +165,6 @@ class MasstransitHildon():
                 text=4
             ))
 
-
-
         vertical_box = gtk.VBox()
         vertical_box.pack_start(horizontal_box)
         horizontal_box.pack_start(self.retour_button)

weboob/applications/qflatboob/main_window.py

@@ -289,7 +289,6 @@ class MainWindow(QtMainWindow):
 
         return False
 
-
     def setHousing(self, housing, nottext='Loading...'):
         if self.housing is not None:
             self.saveNotes()

weboob/applications/qhavedate/contacts.py

@@ -65,7 +65,6 @@ class ThreadMessage(QFrame):
             content = message.content.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('\n', '<br />')
         self.ui.contentLabel.setText(content)
 
-
     def __eq__(self, m):
         if not isinstance(m, Message):
             return False
@@ -199,8 +198,6 @@ class ContactThread(QWidget):
         self.process_reply = None
 
 
-
-
 class ContactProfile(QWidget):
 
     def __init__(self, weboob, contact, parent=None):
@@ -362,7 +359,6 @@ class ContactNotes(QWidget):
 
         self.connect(self.ui.saveButton, SIGNAL('clicked()'), self.saveNotes)
 
-
     def _getNotes_cb(self, backend, data):
         if not backend or not data:
             self.process = None

weboob/applications/qvideoob/main_window.py

@@ -87,7 +87,7 @@ class MainWindow(QtMainWindow):
     def updateVideosDisplay(self):
         for minivideo in self.minivideos:
             if (minivideo.video.nsfw and self.ui.nsfwCheckBox.isChecked() or
-                not minivideo.video.nsfw and self.ui.sfwCheckBox.isChecked()):
+                    not minivideo.video.nsfw and self.ui.sfwCheckBox.isChecked()):
                 minivideo.show()
             else:
                 minivideo.hide()
@@ -119,7 +119,7 @@ class MainWindow(QtMainWindow):
         self.ui.scrollAreaContent.layout().addWidget(minivideo)
         self.minivideos.append(minivideo)
         if (video.nsfw and not self.ui.nsfwCheckBox.isChecked() or
-            not video.nsfw and not self.ui.sfwCheckBox.isChecked()):
+                not video.nsfw and not self.ui.sfwCheckBox.isChecked()):
             minivideo.hide()
 
     def openURL(self):

weboob/applications/suboob/suboob.py

@@ -118,7 +118,6 @@ class Suboob(ReplApplication):
         self.format(subtitle)
         self.flush()
 
-
     def complete_getfile(self, text, line, *ignored):
         args = line.split(' ', 2)
         if len(args) == 2:

weboob/core/repositories.py

@@ -639,7 +639,6 @@ class Repositories(object):
         except BrowserUnavailable, e:
             raise ModuleInstallError('Unable to fetch module: %s' % e)
 
-
         # Check signature
         if module.signed and Keyring.find_gpgv():
             progress.progress(0.5, 'Checking module authenticity...')
@@ -651,7 +650,6 @@ class Repositories(object):
             if not keyring.is_valid(tardata, sig_data):
                 raise ModuleInstallError('Invalid signature for %s.' % module.name)
 
-
         # Extract module from tarball.
         if os.path.isdir(module_dir):
             shutil.rmtree(module_dir)

weboob/tools/application/qt/backendcfg.py

@@ -381,7 +381,7 @@ class BackendCfg(QDialog):
               ', '.join(sorted(cap.__name__.replace('ICap', '') for cap in module.iter_caps()))))
 
         if module.has_caps(ICapAccount) and self.ui.nameEdit.isEnabled() and \
-            module.klass.ACCOUNT_REGISTER_PROPERTIES is not None:
+                module.klass.ACCOUNT_REGISTER_PROPERTIES is not None:
             self.ui.registerButton.show()
         else:
             self.ui.registerButton.hide()

weboob/tools/application/repl.py

@@ -330,7 +330,6 @@ class ReplApplication(Cmd, ConsoleApplication):
 
         return cmd, arg, ignored
 
-
     def onecmd(self, line):
         """
         This REPL method is overrided to catch some particular exceptions.