From 6161a0aacd3492978f4d20e4a6e76a8b951c6402 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Fri, 10 Oct 2014 22:10:41 +0200 Subject: [PATCH] pep8 fixes, modernizations autopep8 -a -r -i --select E711,E712,W601,W602,W603,W604,W690,E304,E401,E502 . Also includes some manual reindentations (many are left after the print() changes). Manually checked, some modernizations not commited here. --- contrib/downloadboob/downloadboob.py | 4 ++- contrib/munin/boobank-munin | 10 ++++---- contrib/munin/weboob-generic | 10 ++++---- docs/source/conf.py | 3 ++- modules/jvmalin/pages.py | 2 +- modules/nolifetv/module.py | 3 ++- modules/nolifetv/pages.py | 4 +-- modules/tvsubtitles/test.py | 2 +- tools/local_install.py | 6 ++--- tools/make_man.py | 25 ++++++++++--------- weboob/applications/boobank/boobank.py | 7 +++--- weboob/applications/cineoob/cineoob.py | 10 ++++---- .../applications/weboorrents/weboorrents.py | 6 ++--- weboob/browser/elements.py | 2 +- weboob/tools/application/console.py | 2 +- weboob/tools/application/repl.py | 6 ++--- weboob/tools/capabilities/paste.py | 2 +- weboob/tools/captcha/virtkeyboard.py | 4 +-- 18 files changed, 57 insertions(+), 51 deletions(-) diff --git a/contrib/downloadboob/downloadboob.py b/contrib/downloadboob/downloadboob.py index 4ccb4ebc..fe7a5268 100755 --- a/contrib/downloadboob/downloadboob.py +++ b/contrib/downloadboob/downloadboob.py @@ -30,7 +30,9 @@ from weboob.core import Weboob from weboob.capabilities.video import CapVideo # hack to workaround bash redirection and encoding problem -import sys, codecs, locale +import sys +import codecs +import locale if sys.stdout.encoding is None: (lang, enc) = locale.getdefaultlocale() diff --git a/contrib/munin/boobank-munin b/contrib/munin/boobank-munin index b3395f50..e6279c52 100755 --- a/contrib/munin/boobank-munin +++ b/contrib/munin/boobank-munin @@ -102,17 +102,17 @@ class BoobankMuninPlugin(object): if check and (last + self.cache_expire) < time.time(): return False - for line in f.xreadlines(): + for line in f: sys.stdout.write(line) return True def new_cache(self, name): - os.umask(0077) + os.umask(0o077) new_name = '%s.new' % name filename = self.cachepath(new_name) try: f = open(filename, 'w') - except IOError, e: + except IOError as e: print >>sys.stderr, 'Unable to create the cache file %s: %s' % (filename, e) return @@ -166,7 +166,7 @@ class BoobankMuninPlugin(object): self.write_output('%s.label %s' % (id, account.label.encode('iso-8859-15'))) if self.cumulate: self.write_output('%s.draw %s' % (id, type)) - except CallErrors, errors: + except CallErrors as errors: self.print_errors(errors) self.print_cache('boobank-munin-config') else: @@ -197,7 +197,7 @@ class BoobankMuninPlugin(object): if account.coming and self.add_coming: balance += account.coming self.write_output('%s.value %d' % (self.account2id(account), balance)) - except CallErrors, errors: + except CallErrors as errors: self.print_errors(errors) self.print_cache('boobank-munin') else: diff --git a/contrib/munin/weboob-generic b/contrib/munin/weboob-generic index 30f81ca1..7e9af9c6 100755 --- a/contrib/munin/weboob-generic +++ b/contrib/munin/weboob-generic @@ -191,17 +191,17 @@ class GenericMuninPlugin(object): if check and (last + self.cache_expire) < time.time(): return False - for line in f.xreadlines(): + for line in f: sys.stdout.write(line) return True def new_cache(self, name): - os.umask(0077) + os.umask(0o077) new_name = '%s.new' % name filename = self.cachepath(new_name) try: f = open(filename, 'w') - except IOError, e: + except IOError as e: print >>sys.stderr, 'Unable to create the cache file %s: %s' % (filename, e) return @@ -310,7 +310,7 @@ class GenericMuninPlugin(object): self.write_output('%s.label %s' % (id.encode('iso-8859-15'), getattr(result, self.attriblabel).encode('iso-8859-15'))) if self.cumulate: self.write_output('%s.draw %s' % (id, type)) - except CallErrors, errors: + except CallErrors as errors: self.print_errors(errors) self.print_cache('%s-config' % self.name) else: @@ -334,7 +334,7 @@ class GenericMuninPlugin(object): value = self.get_value(result) if value is not NotAvailable: self.write_output('%s.value %f' % (self.result2id(result).encode('iso-8859-15'), value)) - except CallErrors, errors: + except CallErrors as errors: self.print_errors(errors) self.print_cache(self.name) else: diff --git a/docs/source/conf.py b/docs/source/conf.py index 2e559529..51ca9c0f 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -11,7 +11,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import os, time +import os +import time os.system('./genapi.py') diff --git a/modules/jvmalin/pages.py b/modules/jvmalin/pages.py index 640fb4f0..910be409 100644 --- a/modules/jvmalin/pages.py +++ b/modules/jvmalin/pages.py @@ -142,7 +142,7 @@ class RoadmapPage(Page): if len(current_step['line']) > 0 and \ len(current_step['departure']) > 0 and \ len(current_step['arrival']) > 0: - current_step['line'] = to_unicode("%s : %s" % \ + current_step['line'] = to_unicode("%s : %s" % (current_step['mode'], current_step['line'])) del current_step['mode'] yield current_step diff --git a/modules/nolifetv/module.py b/modules/nolifetv/module.py index 2afbc30b..eb2558ec 100644 --- a/modules/nolifetv/module.py +++ b/modules/nolifetv/module.py @@ -26,7 +26,8 @@ from weboob.tools.backend import Module, BackendConfig from .browser import NolifeTVBrowser from .video import NolifeTVVideo -import urllib, time +import urllib +import time from hashlib import md5 __all__ = ['NolifeTVModule'] diff --git a/modules/nolifetv/pages.py b/modules/nolifetv/pages.py index ed0835eb..5cabb75d 100644 --- a/modules/nolifetv/pages.py +++ b/modules/nolifetv/pages.py @@ -69,7 +69,7 @@ class VideoPage(Page): class VideoListPage(Page): def is_list_empty(self): - return self.document.getroot() == None + return self.document.getroot() is None def iter_video(self, available_videos): for el in self.document.getroot().xpath('//li/a'): @@ -101,7 +101,7 @@ class FamilyPage(Page): while True: el = el.getnext() - if el == None or el.get('data-role'): + if el is None or el.get('data-role'): break h1 = el.find('.//h1') id = h1.getparent().attrib['href'] diff --git a/modules/tvsubtitles/test.py b/modules/tvsubtitles/test.py index b3ca2f1a..1817e081 100644 --- a/modules/tvsubtitles/test.py +++ b/modules/tvsubtitles/test.py @@ -40,4 +40,4 @@ class TvsubtitlesTest(BackendTest): subtitles = list(self.backend.iter_subtitles('fr', 'sopranos')) assert (len(subtitles) > 0) subtitle = choice(subtitles) - assert self.backend.get_subtitle(subtitle.id) \ No newline at end of file + assert self.backend.get_subtitle(subtitle.id) diff --git a/tools/local_install.py b/tools/local_install.py index 59693f39..b79e9006 100644 --- a/tools/local_install.py +++ b/tools/local_install.py @@ -2,9 +2,9 @@ # -*- coding: utf-8 -*- from __future__ import print_function +import os import subprocess import sys -import os if '--deps' in sys.argv: sys.argv.remove('--deps') @@ -25,8 +25,8 @@ if len(sys.argv) < 2: print("To install all the missing dependencies, add the option --deps") print("at the end of the command line.") print() - print("Error: Please provide a destination, " \ - "for example ‘%s/bin’" % os.getenv('HOME'), file=sys.stderr) + print("Error: Please provide a destination, " + "for example ‘%s/bin’" % os.getenv('HOME'), file=sys.stderr) sys.exit(1) else: dest = os.path.expanduser(sys.argv[1]) diff --git a/tools/make_man.py b/tools/make_man.py index 603c8aa7..a30b9152 100755 --- a/tools/make_man.py +++ b/tools/make_man.py @@ -2,6 +2,17 @@ # -*- coding: utf-8 -*- from __future__ import print_function +import imp +import inspect +import optparse +import os +import re +import sys +import tempfile +import time + +from weboob.tools.application.base import Application + # Copyright(C) 2010-2011 Laurent Bachelier # # This file is part of weboob. @@ -19,16 +30,6 @@ from __future__ import print_function # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -import sys -import os -import tempfile -import imp -import inspect -import optparse -import re -import time - -from weboob.tools.application.base import Application BASE_PATH = os.path.join(os.path.dirname(__file__), os.pardir) DEST_DIR = 'man' @@ -121,8 +122,8 @@ def main(): try: script = imp.load_module("scripts.%s" % fname, f, tmpfile, desc) except ImportError as e: - print("Unable to load the %s script (%s)" \ - % (fname, e), file=sys.stderr) + print("Unable to load the %s script (%s)" + % (fname, e), file=sys.stderr) else: print("Loaded %s" % fname) # Find the applications we can handle diff --git a/weboob/applications/boobank/boobank.py b/weboob/applications/boobank/boobank.py index a6200374..e67f65a6 100644 --- a/weboob/applications/boobank/boobank.py +++ b/weboob/applications/boobank/boobank.py @@ -19,7 +19,8 @@ from __future__ import print_function -import datetime, uuid +import datetime +import uuid from dateutil.relativedelta import relativedelta from dateutil.parser import parse as parse_date from decimal import Decimal, InvalidOperation @@ -334,8 +335,8 @@ class Boobank(ReplApplication): try: end_date = parse_date(end_date) except ValueError: - print('"%s" is an incorrect date format (for example "%s")' % \ - (end_date, (datetime.date.today() - relativedelta(months=1)).strftime('%Y-%m-%d')), file=self.stderr) + print('"%s" is an incorrect date format (for example "%s")' % + (end_date, (datetime.date.today() - relativedelta(months=1)).strftime('%Y-%m-%d')), file=self.stderr) return 3 old_count = self.options.count self.options.count = None diff --git a/weboob/applications/cineoob/cineoob.py b/weboob/applications/cineoob/cineoob.py index 8a3de426..ebe1c2ab 100644 --- a/weboob/applications/cineoob/cineoob.py +++ b/weboob/applications/cineoob/cineoob.py @@ -424,7 +424,7 @@ class Cineoob(ReplApplication): self.start_format() self.format(movie) - #================== TORRENT ================== + # ================== TORRENT ================== def complete_info_torrent(self, text, line, *ignored): args = line.split(' ') @@ -484,9 +484,9 @@ class Cineoob(ReplApplication): except CallErrors as errors: for backend, error, backtrace in errors: if isinstance(error, MagnetOnly): - print(u'Error(%s): No direct URL available, ' \ - u'please provide this magnet URL ' \ - u'to your client:\n%s' % (backend, error.magnet), file=self.stderr) + print(u'Error(%s): No direct URL available, ' + u'please provide this magnet URL ' + u'to your client:\n%s' % (backend, error.magnet), file=self.stderr) return 4 else: self.bcall_error_handler(backend, error, backtrace) @@ -531,7 +531,7 @@ class Cineoob(ReplApplication): for torrent in self.do('iter_torrents', pattern=pattern, caps=CapTorrent): self.cached_format(torrent) - #================== SUBTITLE ================== + # ================== SUBTITLE ================== def complete_info_subtitle(self, text, line, *ignored): args = line.split(' ') diff --git a/weboob/applications/weboorrents/weboorrents.py b/weboob/applications/weboorrents/weboorrents.py index 3b1b3653..9904f4aa 100644 --- a/weboob/applications/weboorrents/weboorrents.py +++ b/weboob/applications/weboorrents/weboorrents.py @@ -162,9 +162,9 @@ class Weboorrents(ReplApplication): except CallErrors as errors: for backend, error, backtrace in errors: if isinstance(error, MagnetOnly): - print(u'Error(%s): No direct URL available, ' \ - u'please provide this magnet URL ' \ - u'to your client:\n%s' % (backend, error.magnet), file=self.stderr) + print(u'Error(%s): No direct URL available, ' + u'please provide this magnet URL ' + u'to your client:\n%s' % (backend, error.magnet), file=self.stderr) return 4 else: self.bcall_error_handler(backend, error, backtrace) diff --git a/weboob/browser/elements.py b/weboob/browser/elements.py index f4b65009..ad5a7948 100644 --- a/weboob/browser/elements.py +++ b/weboob/browser/elements.py @@ -207,7 +207,7 @@ class _ItemElementMeta(type): filters = [(re.sub('^obj_', '', attr_name), attrs[attr_name]) for attr_name, obj in attrs.items() if attr_name.startswith('obj_')] # constants first, then filters, then methods - filters.sort(key=lambda x: x[1]._creation_counter if hasattr(x[1], '_creation_counter') else (sys.maxint if callable(x[1]) else 0)) + filters.sort(key=lambda x: x[1]._creation_counter if hasattr(x[1], '_creation_counter') else (sys.maxsize if callable(x[1]) else 0)) new_class = super(_ItemElementMeta, mcs).__new__(mcs, name, bases, attrs) new_class._attrs = _attrs + [f[0] for f in filters] diff --git a/weboob/tools/application/console.py b/weboob/tools/application/console.py index c62c98ce..81511ee4 100644 --- a/weboob/tools/application/console.py +++ b/weboob/tools/application/console.py @@ -520,7 +520,7 @@ class ConsoleApplication(Application): text = f.read() else: if self.stdin.isatty(): - print('Reading content from stdin... Type ctrl-D ' \ + print('Reading content from stdin... Type ctrl-D ' 'from an empty line to stop.') text = self.stdin.read() return text.decode(self.encoding) diff --git a/weboob/tools/application/repl.py b/weboob/tools/application/repl.py index fd63db01..d95f74cc 100644 --- a/weboob/tools/application/repl.py +++ b/weboob/tools/application/repl.py @@ -204,7 +204,7 @@ class ReplApplication(Cmd, ConsoleApplication): print('This command works with an unique backend. Availables:') for index, (name, backend) in enumerate(e.backends): print('%s%d)%s %s%-15s%s %s' % (self.BOLD, index + 1, self.NC, self.BOLD, name, self.NC, - backend.DESCRIPTION)) + backend.DESCRIPTION)) i = self.ask('Select a backend to proceed with "%s"' % id) if not i.isdigit(): if not i in dict(e.backends): @@ -925,8 +925,8 @@ class ReplApplication(Cmd, ConsoleApplication): self.commands_formatters = {} self.DEFAULT_FORMATTER = self.set_formatter(args[0]) else: - print('Formatter "%s" is not available.\n' \ - 'Available formatters: %s.' % (args[0], ', '.join(self.formatters_loader.get_available_formatters())), file=self.stderr) + print('Formatter "%s" is not available.\n' + 'Available formatters: %s.' % (args[0], ', '.join(self.formatters_loader.get_available_formatters())), file=self.stderr) return 1 else: print('Default formatter: %s' % self.DEFAULT_FORMATTER) diff --git a/weboob/tools/capabilities/paste.py b/weboob/tools/capabilities/paste.py index 0574c57b..fe3c5ddc 100644 --- a/weboob/tools/capabilities/paste.py +++ b/weboob/tools/capabilities/paste.py @@ -66,7 +66,7 @@ def image_mime(data_base64, supported_formats=('gif', 'jpeg', 'png')): return 'image/x-xcf' elif 'pdf' in supported_formats and '%PDF' in beginning: return 'application/pdf' - elif 'tiff' in supported_formats and ('II\x00\x2a' in beginning or \ + elif 'tiff' in supported_formats and ('II\x00\x2a' in beginning or 'MM\x2a\x00' in beginning): return 'image/tiff' diff --git a/weboob/tools/captcha/virtkeyboard.py b/weboob/tools/captcha/virtkeyboard.py index 7510cf06..4c9ca1f6 100644 --- a/weboob/tools/captcha/virtkeyboard.py +++ b/weboob/tools/captcha/virtkeyboard.py @@ -222,9 +222,9 @@ class GridVirtKeyboard(VirtKeyboard): tileW = float(self.width) / cols tileH = float(self.height) / rows - positions = ((s, i * tileW % self.width, i / cols * tileH) \ + positions = ((s, i * tileW % self.width, i / cols * tileH) for i, s in enumerate(symbols)) - coords = dict((s, tuple(map(int, (x, y, x + tileW, y + tileH)))) \ + coords = dict((s, tuple(map(int, (x, y, x + tileW, y + tileH)))) for (s, x, y) in positions) super(GridVirtKeyboard, self).__init__()