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.
This commit is contained in:
Laurent Bachelier 2014-10-10 22:10:41 +02:00
commit 6161a0aacd
18 changed files with 57 additions and 51 deletions

View file

@ -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)

View file

@ -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)

View file

@ -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'

View file

@ -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__()