From c21d1f7925ec66a3994f203738418c13a3d33755 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Fri, 15 Mar 2013 19:54:17 +0100 Subject: [PATCH] Code clarity fixes autopep8 -ir -j2 --select=E303,E125 Diff checked manually. --- contrib/downloadboob/downloadboob.py | 5 ----- modules/bnporc/perso/login.py | 2 -- modules/boursorama/pages/account_history.py | 1 - modules/cmb/backend.py | 7 +------ modules/cmb/hellhttp.py | 1 - modules/creditcooperatif/pro/pages.py | 1 - modules/dresdenwetter/pages.py | 1 - modules/europarl/pages.py | 1 - modules/gdcvault/pages.py | 2 -- modules/googletranslate/backend.py | 1 - modules/ing/pages/login.py | 1 - modules/inrocks/browser.py | 1 - modules/marmiton/pages.py | 1 - modules/newsfeed/backend.py | 4 ---- modules/okc/browser.py | 1 - modules/opacwebaloes/browser.py | 2 +- modules/opensubtitles/pages.py | 1 - modules/parolesmania/test.py | 1 - modules/parolesmusique/test.py | 1 - modules/redmine/pages/wiki.py | 1 - modules/sachsen/backend.py | 2 +- modules/seeklyrics/test.py | 1 - modules/sfr/pages/compose.py | 1 - modules/societegenerale/pages/accounts_list.py | 1 - modules/vimeo/pages.py | 1 - modules/weather/test.py | 1 - weboob/applications/boobathon/boobathon.py | 1 - weboob/applications/boobill/boobill.py | 2 -- weboob/applications/cineoob/cineoob.py | 1 - weboob/applications/masstransit/masstransit.py | 3 --- weboob/applications/qflatboob/main_window.py | 1 - weboob/applications/qhavedate/contacts.py | 4 ---- weboob/applications/qvideoob/main_window.py | 4 ++-- weboob/applications/suboob/suboob.py | 1 - weboob/core/repositories.py | 2 -- weboob/tools/application/qt/backendcfg.py | 2 +- weboob/tools/application/repl.py | 1 - 37 files changed, 6 insertions(+), 59 deletions(-) diff --git a/contrib/downloadboob/downloadboob.py b/contrib/downloadboob/downloadboob.py index 8830768a29..babce1c470 100755 --- a/contrib/downloadboob/downloadboob.py +++ b/contrib/downloadboob/downloadboob.py @@ -136,7 +136,6 @@ def get_filename(self, video, relative=False): 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 @@ def get_linkname(self, video): 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 @@ def remove_download(self, video): 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 @@ def set_linkname(self, video): 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 diff --git a/modules/bnporc/perso/login.py b/modules/bnporc/perso/login.py index be64719bce..0a560e1264 100644 --- a/modules/bnporc/perso/login.py +++ b/modules/bnporc/perso/login.py @@ -61,7 +61,6 @@ def get_string_code(self,string): return code - class LoginPage(BasePage): def on_loaded(self): for td in self.document.getroot().cssselect('td.LibelleErreur'): @@ -128,7 +127,6 @@ def change_password(self, current, new): cookiejar.set_cookie(c) - code_current=vk.get_string_code(current) code_new=vk.get_string_code(new) diff --git a/modules/boursorama/pages/account_history.py b/modules/boursorama/pages/account_history.py index faa3c84b10..7b1aa6aea9 100644 --- a/modules/boursorama/pages/account_history.py +++ b/modules/boursorama/pages/account_history.py @@ -27,7 +27,6 @@ from weboob.tools.capabilities.bank.transactions import FrenchTransaction - __all__ = ['AccountHistory'] class Transaction(FrenchTransaction): diff --git a/modules/cmb/backend.py b/modules/cmb/backend.py index 28723cdaab..6ca85061ee 100644 --- a/modules/cmb/backend.py +++ b/modules/cmb/backend.py @@ -45,7 +45,6 @@ __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 @@ def do_http(): 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 @@ def do_http(): 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 @@ def do_http(): 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') diff --git a/modules/cmb/hellhttp.py b/modules/cmb/hellhttp.py index 4d58832cd7..f755947199 100644 --- a/modules/cmb/hellhttp.py +++ b/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): diff --git a/modules/creditcooperatif/pro/pages.py b/modules/creditcooperatif/pro/pages.py index dc743bf6f2..1d30d131b1 100644 --- a/modules/creditcooperatif/pro/pages.py +++ b/modules/creditcooperatif/pro/pages.py @@ -159,7 +159,6 @@ def get_content(td): else: date += "/%d" % time.localtime().tm_year - t = Transaction(date+""+raw) t.parse(date, re.sub(r'[ ]+', ' ', raw)) t.set_amount("", debit) diff --git a/modules/dresdenwetter/pages.py b/modules/dresdenwetter/pages.py index c6a9ee4d1f..b4faae81ea 100644 --- a/modules/dresdenwetter/pages.py +++ b/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 = [] diff --git a/modules/europarl/pages.py b/modules/europarl/pages.py index 19eaf3352e..9e5378f3de 100644 --- a/modules/europarl/pages.py +++ b/modules/europarl/pages.py @@ -32,7 +32,6 @@ from .video import EuroparlVideo - __all__ = ['VideoPage'] class VideoPage(BasePage): diff --git a/modules/gdcvault/pages.py b/modules/gdcvault/pages.py index 73ac80a782..44316f9c96 100644 --- a/modules/gdcvault/pages.py +++ b/modules/gdcvault/pages.py @@ -35,8 +35,6 @@ #import lxml.etree - - __all__ = ['VideoPage'] class VideoPage(BasePage): diff --git a/modules/googletranslate/backend.py b/modules/googletranslate/backend.py index 588cf711a4..6d37858dd4 100644 --- a/modules/googletranslate/backend.py +++ b/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() diff --git a/modules/ing/pages/login.py b/modules/ing/pages/login.py index 24cc13cbef..89877a03ef 100644 --- a/modules/ing/pages/login.py +++ b/modules/ing/pages/login.py @@ -103,7 +103,6 @@ def error(self): err = self.document.find('//span[@class="error"]') return err is not None - def login(self, password): # 2) And now, the virtual Keyboard try: diff --git a/modules/inrocks/browser.py b/modules/inrocks/browser.py index 3f0fff3a73..97563c75f9 100644 --- a/modules/inrocks/browser.py +++ b/modules/inrocks/browser.py @@ -23,7 +23,6 @@ from weboob.tools.browser import BaseBrowser - class NewspaperInrocksBrowser(BaseBrowser): "NewspaperInrocksBrowser class" PAGES = { diff --git a/modules/marmiton/pages.py b/modules/marmiton/pages.py index 11c077a2d1..e6ed295ea5 100644 --- a/modules/marmiton/pages.py +++ b/modules/marmiton/pages.py @@ -55,7 +55,6 @@ def iter_recipes(self): yield recipe - class RecipePage(BasePage): """ Page which contains a recipe """ diff --git a/modules/newsfeed/backend.py b/modules/newsfeed/backend.py index 3d6c8263d4..16bb6d45b9 100644 --- a/modules/newsfeed/backend.py +++ b/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 @@ def get_thread(self, id, entry=None): 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() diff --git a/modules/okc/browser.py b/modules/okc/browser.py index 714db4df9d..57e6acce2f 100644 --- a/modules/okc/browser.py +++ b/modules/okc/browser.py @@ -44,7 +44,6 @@ class OkCBrowser(BaseBrowser): ('http://%s/profile/[^/]*' % DOMAIN, ProfilePage), )) - logged_in = False def home(self): diff --git a/modules/opacwebaloes/browser.py b/modules/opacwebaloes/browser.py index 02fa64b186..3daea7c9f9 100644 --- a/modules/opacwebaloes/browser.py +++ b/modules/opacwebaloes/browser.py @@ -60,7 +60,7 @@ def login(self): 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): diff --git a/modules/opensubtitles/pages.py b/modules/opensubtitles/pages.py index 349964edcb..e7b90d19df 100644 --- a/modules/opensubtitles/pages.py +++ b/modules/opensubtitles/pages.py @@ -101,7 +101,6 @@ def get_subtitle_from_line(self,line): return subtitle - class SubtitlePage(BasePage): """ Page which contains a single subtitle for a movie """ diff --git a/modules/parolesmania/test.py b/modules/parolesmania/test.py index 65cc832a46..19a70d6fff 100644 --- a/modules/parolesmania/test.py +++ b/modules/parolesmania/test.py @@ -36,7 +36,6 @@ def test_search_song_n_get(self): 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: diff --git a/modules/parolesmusique/test.py b/modules/parolesmusique/test.py index 96e5692700..a9b2a9f367 100644 --- a/modules/parolesmusique/test.py +++ b/modules/parolesmusique/test.py @@ -36,7 +36,6 @@ def test_search_song_n_get(self): 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: diff --git a/modules/redmine/pages/wiki.py b/modules/redmine/pages/wiki.py index 48c1a265b8..27fa4bef91 100644 --- a/modules/redmine/pages/wiki.py +++ b/modules/redmine/pages/wiki.py @@ -37,6 +37,5 @@ def get_authenticity_token(self): return wiki_form.xpath('div/input')[0].get('value') - class WikiPage(BasePage): pass diff --git a/modules/sachsen/backend.py b/modules/sachsen/backend.py index 65f4d78f44..54a310147e 100644 --- a/modules/sachsen/backend.py +++ b/modules/sachsen/backend.py @@ -46,7 +46,7 @@ def iter_gauges(self, pattern=None): 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): diff --git a/modules/seeklyrics/test.py b/modules/seeklyrics/test.py index cbbe3a0c5a..64a3a4ab67 100644 --- a/modules/seeklyrics/test.py +++ b/modules/seeklyrics/test.py @@ -36,7 +36,6 @@ def test_search_song_n_get(self): 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: diff --git a/modules/sfr/pages/compose.py b/modules/sfr/pages/compose.py index a2d4d22f3b..ec76774809 100644 --- a/modules/sfr/pages/compose.py +++ b/modules/sfr/pages/compose.py @@ -24,7 +24,6 @@ from weboob.tools.browser import BasePage - __all__ = ['ClosePage', 'ComposePage', 'ConfirmPage', 'SentPage'] diff --git a/modules/societegenerale/pages/accounts_list.py b/modules/societegenerale/pages/accounts_list.py index efbbad4791..52cfaedfeb 100644 --- a/modules/societegenerale/pages/accounts_list.py +++ b/modules/societegenerale/pages/accounts_list.py @@ -171,7 +171,6 @@ def iter_transactions(self, coming): 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')): diff --git a/modules/vimeo/pages.py b/modules/vimeo/pages.py index 6cf493f4c6..06becb8900 100644 --- a/modules/vimeo/pages.py +++ b/modules/vimeo/pages.py @@ -38,7 +38,6 @@ from .video import VimeoVideo - __all__ = ['VideoPage'] class VideoPage(BasePage): diff --git a/modules/weather/test.py b/modules/weather/test.py index bd2aa69b33..49b826baca 100644 --- a/modules/weather/test.py +++ b/modules/weather/test.py @@ -23,7 +23,6 @@ class WeatherTest(BackendTest): BACKEND = 'weather' - def test_cities(self): paris = self.backend.iter_city_search('crappything¶m=;drop database') self.assertTrue(len(list(paris)) == 0) diff --git a/weboob/applications/boobathon/boobathon.py b/weboob/applications/boobathon/boobathon.py index 4629a74003..adb8db6330 100644 --- a/weboob/applications/boobathon/boobathon.py +++ b/weboob/applications/boobathon/boobathon.py @@ -764,7 +764,6 @@ def do_cancel(self, line): print >>sys.stderr, "There isn't any task in progress." return 1 - def load_default_backends(self): """ Overload a BaseApplication method. diff --git a/weboob/applications/boobill/boobill.py b/weboob/applications/boobill/boobill.py index 7218a4206d..b40d6d5bbd 100644 --- a/weboob/applications/boobill/boobill.py +++ b/weboob/applications/boobill/boobill.py @@ -181,7 +181,6 @@ def do_download(self, line): 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 @@ def download_all(self, id, names): print >>sys.stderr, 'Unable to write bill in "%s": %s' % (dest, e) return 1 - return diff --git a/weboob/applications/cineoob/cineoob.py b/weboob/applications/cineoob/cineoob.py index d03797ae38..93f1a731ca 100644 --- a/weboob/applications/cineoob/cineoob.py +++ b/weboob/applications/cineoob/cineoob.py @@ -559,7 +559,6 @@ def do_info_subtitle(self, id): self.format(subtitle) self.flush() - def complete_getfile_subtitle(self, text, line, *ignored): args = line.split(' ', 2) if len(args) == 2: diff --git a/weboob/applications/masstransit/masstransit.py b/weboob/applications/masstransit/masstransit.py index dc589f1a24..f00fbfd61f 100644 --- a/weboob/applications/masstransit/masstransit.py +++ b/weboob/applications/masstransit/masstransit.py @@ -132,7 +132,6 @@ def __init__(self, weboob): self.treestore = gtk.TreeStore(str, str, str, str, str) treeview = gtk.TreeView(self.treestore) - treeview.append_column( gtk.TreeViewColumn( 'Train', @@ -166,8 +165,6 @@ def __init__(self, weboob): text=4 )) - - vertical_box = gtk.VBox() vertical_box.pack_start(horizontal_box) horizontal_box.pack_start(self.retour_button) diff --git a/weboob/applications/qflatboob/main_window.py b/weboob/applications/qflatboob/main_window.py index 66e5cf759d..8f17165a80 100644 --- a/weboob/applications/qflatboob/main_window.py +++ b/weboob/applications/qflatboob/main_window.py @@ -289,7 +289,6 @@ def setPhoto(self, housing, item): return False - def setHousing(self, housing, nottext='Loading...'): if self.housing is not None: self.saveNotes() diff --git a/weboob/applications/qhavedate/contacts.py b/weboob/applications/qhavedate/contacts.py index d758d43556..377eef7b10 100644 --- a/weboob/applications/qhavedate/contacts.py +++ b/weboob/applications/qhavedate/contacts.py @@ -65,7 +65,6 @@ def set_message(self, message): content = message.content.replace('&', '&').replace('<', '<').replace('>', '>').replace('\n', '
') self.ui.contentLabel.setText(content) - def __eq__(self, m): if not isinstance(m, Message): return False @@ -199,8 +198,6 @@ def _postReply_eb(self, backend, error, backtrace): self.process_reply = None - - class ContactProfile(QWidget): def __init__(self, weboob, contact, parent=None): @@ -362,7 +359,6 @@ def __init__(self, weboob, contact, parent=None): self.connect(self.ui.saveButton, SIGNAL('clicked()'), self.saveNotes) - def _getNotes_cb(self, backend, data): if not backend or not data: self.process = None diff --git a/weboob/applications/qvideoob/main_window.py b/weboob/applications/qvideoob/main_window.py index 06141f7a2f..def9ded93d 100644 --- a/weboob/applications/qvideoob/main_window.py +++ b/weboob/applications/qvideoob/main_window.py @@ -87,7 +87,7 @@ def sfwChanged(self, state): 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 @@ def addVideo(self, backend, video): 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): diff --git a/weboob/applications/suboob/suboob.py b/weboob/applications/suboob/suboob.py index 6d5d7ee1e5..fcf4cb7472 100644 --- a/weboob/applications/suboob/suboob.py +++ b/weboob/applications/suboob/suboob.py @@ -118,7 +118,6 @@ def do_info(self, id): self.format(subtitle) self.flush() - def complete_getfile(self, text, line, *ignored): args = line.split(' ', 2) if len(args) == 2: diff --git a/weboob/core/repositories.py b/weboob/core/repositories.py index 758a0567b4..ba58924cbb 100644 --- a/weboob/core/repositories.py +++ b/weboob/core/repositories.py @@ -639,7 +639,6 @@ def install(self, module, progress=IProgress()): 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 @@ def install(self, module, progress=IProgress()): 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) diff --git a/weboob/tools/application/qt/backendcfg.py b/weboob/tools/application/qt/backendcfg.py index 5e29800ab0..ff1873e792 100644 --- a/weboob/tools/application/qt/backendcfg.py +++ b/weboob/tools/application/qt/backendcfg.py @@ -381,7 +381,7 @@ def moduleSelectionChanged(self): ', '.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() diff --git a/weboob/tools/application/repl.py b/weboob/tools/application/repl.py index 336a2d3cb4..893e25901e 100644 --- a/weboob/tools/application/repl.py +++ b/weboob/tools/application/repl.py @@ -330,7 +330,6 @@ def parseline(self, line): return cmd, arg, ignored - def onecmd(self, line): """ This REPL method is overrided to catch some particular exceptions. -- GitLab