nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use newer form of catching exceptions

Browse source 
autopep8 -i --select=W602
Also some other minor deprecated syntax changes, like "while 1".
I did not commit the less obvious changes.
This commit is contained in:
Laurent Bachelier 2013-07-27 15:13:48 +02:00
commit a6ad7e83ff
72 changed files with 151 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

4
weboob/applications/boobill/boobill.py
View file

@ -193,7 +193,7 @@ class Boobill(ReplApplication):
try:
with open(dest, 'w') as f:
f.write(buf)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to write bill in "%s": %s' % (dest, e)
return 1
return
@ -210,7 +210,7 @@ class Boobill(ReplApplication):
try:
with open(dest, 'w') as f:
f.write(buf)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to write bill in "%s": %s' % (dest, e)
return 1

2
weboob/applications/boobmsg/boobmsg.py
View file

@ -373,7 +373,7 @@ class Boobmsg(ReplApplication):
try:
self.do('post_message', message, backends=backend_name).wait()
except CallErrors, errors:
except CallErrors as errors:
self.bcall_errors_handler(errors)
else:
if self.interactive:

8
weboob/applications/cineoob/cineoob.py
View file

@ -490,11 +490,11 @@ class Cineoob(ReplApplication):
try:
with open(dest, 'w') as f:
f.write(buf)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to write .torrent in "%s": %s' % (dest, e)
return 1
return
except CallErrors, errors:
except CallErrors as errors:
for backend, error, backtrace in errors:
if isinstance(error, MagnetOnly):
print >>sys.stderr, u'Error(%s): No direct URL available, ' \
@ -598,11 +598,11 @@ class Cineoob(ReplApplication):
try:
with open(dest, 'w') as f:
f.write(buf)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to write file in "%s": %s' % (dest, e)
return 1
return
except CallErrors, errors:
except CallErrors as errors:
for backend, error, backtrace in errors:
self.bcall_error_handler(backend, error, backtrace)

2
weboob/applications/cookboob/cookboob.py
View file

@ -141,7 +141,7 @@ class Cookboob(ReplApplication):
try:
with codecs.open(dest, 'w', 'utf-8') as f:
f.write(xmlstring)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to write .kreml in "%s": %s' % (dest, e)
return 1
return

4
weboob/applications/havedate/havedate.py
View file

@ -70,7 +70,7 @@ class HaveDate(Boobmsg):
try:
self.do('init_optimizations').wait()
except CallErrors, e:
except CallErrors as e:
self.bcall_errors_handler(e)
optimizations = self.storage.get('optims')
@ -157,7 +157,7 @@ class HaveDate(Boobmsg):
except KeyError:
pass
sys.stdout.write('.\n')
except CallErrors, errors:
except CallErrors as errors:
for backend, error, backtrace in errors:
if isinstance(error, OptimizationNotFound):
self.logger.error(u'Error(%s): Optimization "%s" not found' % (backend.name, optim_name))

14
weboob/applications/monboob/monboob.py
View file

@ -66,14 +66,14 @@ class MonboobScheduler(Scheduler):
port = self.app.options.smtpd
try:
FakeSMTPD(self.app, host, int(port))
except socket.error, e:
except socket.error as e:
self.logger.error('Unable to start the SMTP daemon: %s' % e)
return False
# XXX Fuck, we shouldn't copy this piece of code from
# weboob.scheduler.Scheduler.run().
try:
while 1:
while True:
self.stop_event.wait(0.1)
if self.app.options.smtpd:
asyncore.loop(timeout=0.1, count=1)
@ -178,10 +178,10 @@ class Monboob(ReplApplication):
content += unicode(s, charset)
else:
content += unicode(s)
except UnicodeError, e:
except UnicodeError as e:
self.logger.warning('Unicode error: %s' % e)
continue
except Exception, e:
except Exception as e:
self.logger.exception(e)
continue
else:
@ -235,7 +235,7 @@ class Monboob(ReplApplication):
content=content)
try:
backend.post_message(message)
except Exception, e:
except Exception as e:
content = u'Unable to send message to %s:\n' % thread_id
content += u'\n\t%s\n' % to_unicode(e)
if logging.root.level == logging.DEBUG:
@ -269,7 +269,7 @@ class Monboob(ReplApplication):
for backend, message in self.weboob.do('iter_unread_messages'):
if self.send_email(backend, message):
backend.set_message_read(message)
except CallErrors, e:
except CallErrors as e:
self.bcall_errors_handler(e)
def send_email(self, backend, mail):
@ -363,7 +363,7 @@ class Monboob(ReplApplication):
try:
smtp = SMTP(self.config.get('smtp'))
smtp.sendmail(sender, recipient, msg.as_string())
except Exception, e:
except Exception as e:
self.logger.error('Unable to deliver mail: %s' % e)
return False
else:

2
weboob/applications/pastoob/pastoob.py
View file

@ -88,7 +88,7 @@ class Pastoob(ReplApplication):
try:
with codecs.open(filename, encoding=locale.getpreferredencoding()) as fp:
contents = fp.read()
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to open file "%s": %s' % (filename, e.strerror)
return 1

3
weboob/applications/qcineoob/main_window.py
View file

@ -382,8 +382,7 @@ class MainWindow(QtMainWindow):
if self.ui.backendEdit.count() == 0:
self.backendsConfig()
langs = LANGUAGE_CONV.keys()
langs.sort()
langs = sorted(LANGUAGE_CONV.keys())
for lang in langs:
self.ui.langCombo.addItem(lang)
self.ui.langCombo.hide()

3
weboob/applications/qcineoob/movie.py
View file

@ -33,8 +33,7 @@ class Movie(QFrame):
self.parent = parent
self.ui = Ui_Movie()
self.ui.setupUi(self)
langs = LANGUAGE_CONV.keys()
langs.sort()
langs = sorted(LANGUAGE_CONV.keys())
for lang in langs:
self.ui.langCombo.addItem(lang)

2
weboob/applications/qcineoob/subtitle.py
View file

@ -82,7 +82,7 @@ class Subtitle(QFrame):
try:
with open(dest, 'w') as f:
f.write(data)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to write subtitle file in "%s": %s' % (dest, e)
return 1
return

2
weboob/applications/qcineoob/torrent.py
View file

@ -86,7 +86,7 @@ class Torrent(QFrame):
try:
with open(unicode(dest), 'w') as f:
f.write(data)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to write .torrent in "%s": %s' % (dest, e)
return 1
return

2
weboob/applications/qcookboob/recipe.py
View file

@ -105,7 +105,7 @@ class Recipe(QFrame):
try:
with codecs.open(dest, 'w', 'utf-8') as f:
f.write(data)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to write Krecipe file in "%s": %s' % (dest, e)
return 1
return

2
weboob/applications/radioob/radioob.py
View file

@ -94,7 +94,7 @@ class Radioob(ReplApplication):
self.logger.debug(u'You can set the media_player key to the player you prefer in the radioob '
'configuration file.')
self.player.play(radio.streams[0], player_name=player_name, player_args=media_player_args)
except (InvalidMediaPlayer, MediaPlayerNotFound), e:
except (InvalidMediaPlayer, MediaPlayerNotFound) as e:
print '%s\nRadio URL: %s' % (e, radio.streams[0].url)
def complete_info(self, text, line, *ignored):

2
weboob/applications/suboob/suboob.py
View file

@ -157,7 +157,7 @@ class Suboob(ReplApplication):
try:
with open(dest, 'w') as f:
f.write(buf)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to write file in "%s": %s' % (dest, e)
return 1
else:

2
weboob/applications/traveloob/traveloob.py
View file

@ -101,7 +101,7 @@ class Traveloob(ReplApplication):
try:
filters.departure_time = self.parse_datetime(self.options.departure_time)
filters.arrival_time = self.parse_datetime(self.options.arrival_time)
except ValueError, e:
except ValueError as e:
print >>sys.stderr, 'Invalid datetime value: %s' % e
print >>sys.stderr, 'Please enter a datetime in form "yyyy-mm-dd HH:MM" or "HH:MM".'
return 1

2
weboob/applications/videoob/videoob.py
View file

@ -154,7 +154,7 @@ class Videoob(ReplApplication):
self.logger.info(u'You can set the media_player key to the player you prefer in the videoob '
'configuration file.')
self.player.play(video, player_name=player_name, player_args=media_player_args)
except (InvalidMediaPlayer, MediaPlayerNotFound), e:
except (InvalidMediaPlayer, MediaPlayerNotFound) as e:
print '%s\nVideo URL: %s' % (e, video.url)
def complete_info(self, text, line, *ignored):

4
weboob/applications/webcontentedit/webcontentedit.py
View file

@ -113,7 +113,7 @@ class WebContentEdit(ReplApplication):
sys.stdout.flush()
try:
self.do('push_content', content, message, minor=minor, backends=[content.backend]).wait()
except CallErrors, e:
except CallErrors as e:
errors.errors += e.errors
sys.stdout.write(' error (content saved in %s)\n' % path)
else:
@ -136,7 +136,7 @@ class WebContentEdit(ReplApplication):
sys.stdout.flush()
try:
self.do('push_content', content, message, minor=minor, backends=[content.backend]).wait()
except CallErrors, e:
except CallErrors as e:
errors.errors += e.errors
sys.stdout.write(' error\n')
else:

2
weboob/applications/weboobcfg/weboobcfg.py
View file

@ -120,7 +120,7 @@ class WeboobCfg(ReplApplication):
for instance_name, name, params in sorted(self.weboob.backends_config.iter_backends()):
try:
module = self.weboob.modules_loader.get_or_load_module(name)
except ModuleLoadError, e:
except ModuleLoadError as e:
self.logger.warning('Unable to load module %r: %s' % (name, e))
continue

4
weboob/applications/weboobrepos/weboobrepos.py
View file

@ -95,7 +95,7 @@ class WeboobRepos(ReplApplication):
try:
with open(index_file, 'r') as fp:
r.parse_index(fp)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to open repository: %s' % e
print >>sys.stderr, 'Use the "create" command before.'
return 1
@ -131,7 +131,7 @@ class WeboobRepos(ReplApplication):
if not os.path.exists(krname):
raise Exception('No valid key file found.')
kr_mtime = mktime(strptime(str(r.key_update), '%Y%m%d%H%M'))
os.chmod(krname, 0644)
os.chmod(krname, 0o644)
os.utime(krname, (kr_mtime, kr_mtime))
else:
print 'Keyring is up to date'

4
weboob/applications/weboorrents/weboorrents.py
View file

@ -137,11 +137,11 @@ class Weboorrents(ReplApplication):
try:
with open(dest, 'w') as f:
f.write(buf)
except IOError, e:
except IOError as e:
print >>sys.stderr, 'Unable to write .torrent in "%s": %s' % (dest, e)
return 1
return
except CallErrors, errors:
except CallErrors as errors:
for backend, error, backtrace in errors:
if isinstance(error, MagnetOnly):
print >>sys.stderr, u'Error(%s): No direct URL available, ' \

4
weboob/core/backendscfg.py
View file

@ -49,11 +49,11 @@ class BackendsConfig(object):
fptr.close()
else:
try:
os.mknod(confpath, 0600)
os.mknod(confpath, 0o600)
except OSError:
fptr = open(confpath, 'w')
fptr.close()
os.chmod(confpath, 0600)
os.chmod(confpath, 0o600)
else:
if sys.platform != 'win32':
if mode & stat.S_IRGRP or mode & stat.S_IROTH:

4
weboob/core/bcall.py
View file

@ -112,7 +112,7 @@ class BackendsCall(object):
result = function(backend, *args, **kwargs)
else:
result = getattr(backend, function)(*args, **kwargs)
except Exception, error:
except Exception as error:
self.logger.debug('%s: Called function %s raised an error: %r' % (backend, function, error))
self._store_error(backend, error)
else:
@ -125,7 +125,7 @@ class BackendsCall(object):
# Lock mutex only in loop in case the iterator is slow
# (for example if backend do some parsing operations)
self._store_result(backend, subresult)
except Exception, error:
except Exception as error:
self._store_error(backend, error)
else:
self._store_result(backend, result)

4
weboob/core/modules.py
View file

@ -118,7 +118,7 @@ class ModulesLoader(object):
for existing_module_name in self.iter_existing_module_names():
try:
self.load_module(existing_module_name)
except ModuleLoadError, e:
except ModuleLoadError as e:
self.logger.warning(e)
def load_module(self, module_name):
@ -139,7 +139,7 @@ class ModulesLoader(object):
finally:
if fp:
fp.close()
except Exception, e:
except Exception as e:
if logging.root.level == logging.DEBUG:
self.logger.exception(e)
raise ModuleLoadError(module_name, e)

4
weboob/core/ouiboube.py
View file

@ -223,7 +223,7 @@ class Weboob(object):
module = None
try:
module = self.modules_loader.get_or_load_module(module_name)
except ModuleLoadError, e:
except ModuleLoadError as e:
self.logger.error(u'Unable to load module "%s": %s' % (module_name, e))
continue
@ -233,7 +233,7 @@ class Weboob(object):
try:
backend_instance = module.create_instance(self, instance_name, params, storage)
except BaseBackend.ConfigError, e:
except BaseBackend.ConfigError as e:
if errors is not None:
errors.append(self.LoadError(instance_name, e))
else:

20
weboob/core/repositories.py
View file

@ -172,7 +172,7 @@ class Repository(object):
filename = os.path.join(self.localurl2path(), self.INDEX)
try:
fp = open(filename, 'r')
except IOError, e:
except IOError as e:
# This local repository doesn't contain a built modules.list index.
self.name = Repositories.url2filename(self.url)
self.build_index(self.localurl2path(), filename)
@ -182,7 +182,7 @@ class Repository(object):
browser = WeboobBrowser()
try:
fp = browser.openurl(posixpath.join(self.url, self.INDEX))
except BrowserUnavailable, e:
except BrowserUnavailable as e:
raise RepositoryUnavailable(unicode(e))
self.parse_index(fp)
@ -212,7 +212,7 @@ class Repository(object):
try:
keyring_data = browser.readurl(posixpath.join(self.url, self.KEYRING))
sig_data = browser.readurl(posixpath.join(self.url, self.KEYRING + '.sig'))
except BrowserUnavailable, e:
except BrowserUnavailable as e:
raise RepositoryUnavailable(unicode(e))
if keyring.exists():
if not keyring.is_valid(keyring_data, sig_data):
@ -241,9 +241,9 @@ class Repository(object):
self.maintainer = items['maintainer']
self.signed = bool(int(items.get('signed', '0')))
self.key_update = int(items.get('key_update', '0'))
except KeyError, e:
except KeyError as e:
raise RepositoryUnavailable('Missing global parameters in repository: %s' % e)
except ValueError, e:
except ValueError as e:
raise RepositoryUnavailable('Incorrect value in repository parameters: %s' % e)
if len(self.name) == 0:
@ -297,7 +297,7 @@ class Repository(object):
finally:
if fp:
fp.close()
except Exception, e:
except Exception as e:
print >>sys.stderr, 'Unable to build module %s: [%s] %s' % (name, type(e).__name__, e)
else:
m = ModuleInfo(module.name)
@ -538,7 +538,7 @@ class Repositories(object):
def _parse_source_list(self):
l = []
with open(self.sources_list, 'r') as f:
for line in f.xreadlines():
for line in f:
line = line.strip() % {'version': self.version}
m = re.match('(file|https?)://.*', line)
if m:
@ -572,7 +572,7 @@ class Repositories(object):
else:
progress.error('Cannot find gpgv to check for repository authenticity.\n'
'You should install GPG for better security.')
except RepositoryUnavailable, e:
except RepositoryUnavailable as e:
progress.error('Unable to load repository: %s' % e)
else:
self.repositories.append(repository)
@ -617,7 +617,7 @@ class Repositories(object):
inst_progress = InstallProgress(n)
try:
self.install(info, inst_progress)
except ModuleInstallError, e:
except ModuleInstallError as e:
inst_progress.progress(1.0, unicode(e))
def install(self, module, progress=IProgress()):
@ -657,7 +657,7 @@ class Repositories(object):
progress.progress(0.2, 'Downloading module...')
try:
tardata = browser.readurl(module.url)
except BrowserUnavailable, e:
except BrowserUnavailable as e:
raise ModuleInstallError('Unable to fetch module: %s' % e)
# Check signature

2
weboob/core/scheduler.py
View file

@ -118,7 +118,7 @@ class Scheduler(IScheduler):
def run(self):
try:
while 1:
while True:
self.stop_event.wait(0.1)
except KeyboardInterrupt:
self._wait_to_stop()

8
weboob/tools/application/base.py
View file

@ -351,7 +351,7 @@ class BaseApplication(object):
def create_logging_file_handler(self, filename):
try:
stream = open(filename, 'w')
except IOError, e:
except IOError as e:
self.logger.error('Unable to create the logging file: %s' % e)
sys.exit(1)
else:
@ -383,7 +383,7 @@ class BaseApplication(object):
try:
app = klass()
except BackendsConfig.WrongPermissions, e:
except BackendsConfig.WrongPermissions as e:
print >>sys.stderr, e
sys.exit(1)
@ -396,10 +396,10 @@ class BaseApplication(object):
sys.exit(0)
except EOFError:
sys.exit(0)
except ConfigError, e:
except ConfigError as e:
print >>sys.stderr, 'Configuration error: %s' % e
sys.exit(1)
except CallErrors, e:
except CallErrors as e:
app.bcall_errors_handler(e)
sys.exit(1)
finally:

14
weboob/tools/application/console.py
View file

@ -194,7 +194,7 @@ class ConsoleApplication(BaseApplication):
def run(klass, args=None):
try:
super(ConsoleApplication, klass).run(args)
except BackendNotFound, e:
except BackendNotFound as e:
print 'Error: Backend "%s" not found.' % e
sys.exit(1)
@ -223,7 +223,7 @@ class ConsoleApplication(BaseApplication):
def register_backend(self, name, ask_add=True):
try:
backend = self.weboob.modules_loader.get_or_load_module(name)
except ModuleLoadError, e:
except ModuleLoadError as e:
backend = None
if not backend:
@ -240,7 +240,7 @@ class ConsoleApplication(BaseApplication):
website = 'on website %s' % backend.website
else:
website = 'with backend %s' % backend.name
while 1:
while True:
asked_config = False
for key, prop in backend.klass.ACCOUNT_REGISTER_PROPERTIES.iteritems():
if not asked_config:
@ -254,7 +254,7 @@ class ConsoleApplication(BaseApplication):
print '-----------------------------%s' % ('-' * len(website))
try:
backend.klass.register_account(account)
except AccountRegisterError, e:
except AccountRegisterError as e:
print u'%s' % e
if self.ask('Do you want to try again?', default=True):
continue
@ -275,7 +275,7 @@ class ConsoleApplication(BaseApplication):
def install_module(self, name):
try:
self.weboob.repositories.install(name)
except ModuleInstallError, e:
except ModuleInstallError as e:
print >>sys.stderr, 'Unable to install module "%s": %s' % (name, e)
return False
@ -307,7 +307,7 @@ class ConsoleApplication(BaseApplication):
items.update(params)
params = items
config = module.config.load(self.weboob, bname, name, params, nofail=True)
except ModuleLoadError, e:
except ModuleLoadError as e:
print >>sys.stderr, 'Unable to load module "%s": %s' % (name, e)
return 1
@ -441,7 +441,7 @@ class ConsoleApplication(BaseApplication):
try:
v.set(line)
except ValueError, e:
except ValueError as e:
print >>sys.stderr, u'Error: %s' % e
else:
break

5
weboob/tools/application/formatters/load.py
View file

@ -37,15 +37,14 @@ class FormattersLoader(object):
def get_available_formatters(self):
l = set(self.formatters.iterkeys())
l = l.union(self.BUILTINS)
l = list(l)
l.sort()
l = sorted(l)
return l
def build_formatter(self, name):
if not name in self.formatters:
try:
self.formatters[name] = self.load_builtin_formatter(name)
except ImportError, e:
except ImportError as e:
FormattersLoader.BUILTINS.remove(name)
raise FormatterLoadError('Unable to load formatter "%s": %s' % (name, e))
return self.formatters[name]()

10
weboob/tools/application/qt/backendcfg.py
View file

@ -170,7 +170,7 @@ class BackendCfg(QDialog):
pd.setWindowModality(Qt.WindowModal)
try:
self.weboob.repositories.update(pd)
except ModuleInstallError, err:
except ModuleInstallError as err:
QMessageBox.critical(self, self.tr('Update error'),
unicode(self.tr('Unable to update modules: %s' % (err))),
QMessageBox.Ok)
@ -206,7 +206,7 @@ class BackendCfg(QDialog):
try:
self.weboob.repositories.install(minfo, pd)
except ModuleInstallError, err:
except ModuleInstallError as err:
QMessageBox.critical(self, self.tr('Install error'),
unicode(self.tr('Unable to install module %s: %s' % (minfo.name, err))),
QMessageBox.Ok)
@ -442,7 +442,7 @@ class BackendCfg(QDialog):
try:
value = qtvalue.get_value()
except ValueError, e:
except ValueError as e:
QMessageBox.critical(self, self.tr('Invalid value'),
unicode(self.tr('Invalid value for field "%s":<br /><br />%s')) % (field.label, e))
return
@ -507,7 +507,7 @@ class BackendCfg(QDialog):
for key, widget in props_widgets.iteritems():
try:
v = widget.get_value()
except ValueError, e:
except ValueError as e:
QMessageBox.critical(self, self.tr('Invalid value'),
unicode(self.tr('Invalid value for field "%s":<br /><br />%s')) % (key, e))
end = False
@ -517,7 +517,7 @@ class BackendCfg(QDialog):
if end:
try:
module.klass.register_account(account)
except AccountRegisterError, e:
except AccountRegisterError as e:
QMessageBox.critical(self, self.tr('Error during register'),
unicode(self.tr('Unable to register account %s:<br /><br />%s')) % (website, e))
end = False

8
weboob/tools/application/qt/qt.py
View file

@ -150,12 +150,12 @@ class QtApplication(QApplication, BaseApplication):
return Weboob(scheduler=QtScheduler(self))
def load_backends(self, *args, **kwargs):
while 1:
while True:
try:
return BaseApplication.load_backends(self, *args, **kwargs)
except VersionsMismatchError, e:
except VersionsMismatchError as e:
msg = 'Versions of modules mismatch with version of weboob.'
except ConfigError, e:
except ConfigError as e:
msg = unicode(e)
res = QMessageBox.question(None, 'Configuration error', u'%s\n\nDo you want to update repositories?' % msg, QMessageBox.Yes|QMessageBox.No)
@ -168,7 +168,7 @@ class QtApplication(QApplication, BaseApplication):
pd.setWindowModality(Qt.WindowModal)
try:
self.weboob.update(pd)
except ModuleInstallError, err:
except ModuleInstallError as err:
QMessageBox.critical(None, self.tr('Update error'),
unicode(self.tr('Unable to update repositories: %s' % err)),
QMessageBox.Ok)

24
weboob/tools/application/repl.py
View file

@ -174,7 +174,7 @@ class ReplApplication(Cmd, ConsoleApplication):
id = '%s@%s' % (obj.id, obj.backend)
try:
return ConsoleApplication.parse_id(self, id, unique_backend)
except BackendNotGiven, e:
except BackendNotGiven as e:
backend_name = None
while not backend_name:
print 'This command works with an unique backend. Availables:'
@ -206,7 +206,7 @@ class ReplApplication(Cmd, ConsoleApplication):
try:
backend = self.weboob.get_backend(obj.backend)
return backend.fillobj(obj, fields)
except UserError, e:
except UserError as e:
self.bcall_error_handler(backend, e, '')
_id, backend_name = self.parse_id(_id)
@ -355,11 +355,11 @@ class ReplApplication(Cmd, ConsoleApplication):
try:
try:
return super(ReplApplication, self).onecmd(line)
except CallErrors, e:
except CallErrors as e:
self.bcall_errors_handler(e)
except BackendNotGiven, e:
except BackendNotGiven as e:
print >>sys.stderr, 'Error: %s' % str(e)
except NotEnoughArguments, e:
except NotEnoughArguments as e:
print >>sys.stderr, 'Error: not enough arguments. %s' % str(e)
except (KeyboardInterrupt, EOFError):
# ^C during a command process doesn't exit application.
@ -739,7 +739,7 @@ class ReplApplication(Cmd, ConsoleApplication):
else:
try:
self.condition = ResultsCondition(line)
except ResultsConditionError, e:
except ResultsConditionError as e:
print >>sys.stderr, '%s' % e
return 2
else:
@ -977,7 +977,7 @@ class ReplApplication(Cmd, ConsoleApplication):
caps=ICapCollection):
if res:
collections.append(res)
except CallErrors, errors:
except CallErrors as errors:
for backend, error, backtrace in errors.errors:
if isinstance(error, CollectionNotFound):
pass
@ -1006,7 +1006,7 @@ class ReplApplication(Cmd, ConsoleApplication):
collections.append(res)
else:
objects.append(res)
except CallErrors, errors:
except CallErrors as errors:
for backend, error, backtrace in errors.errors:
if isinstance(error, CollectionNotFound):
pass
@ -1034,7 +1034,7 @@ class ReplApplication(Cmd, ConsoleApplication):
if len(self.objects) == 0 and len(self.collections) == 0:
try:
self.objects, self.collections = self._fetch_objects(objs=self.COLLECTION_OBJECTS)
except CallErrors, errors:
except CallErrors as errors:
for backend, error, backtrace in errors.errors:
if isinstance(error, CollectionNotFound):
pass
@ -1062,7 +1062,7 @@ class ReplApplication(Cmd, ConsoleApplication):
"""
try:
self.formatter = self.formatters_loader.build_formatter(name)
except FormatterLoadError, e:
except FormatterLoadError as e:
print >>sys.stderr, '%s' % e
if self.DEFAULT_FORMATTER == name:
self.DEFAULT_FORMATTER = ReplApplication.DEFAULT_FORMATTER
@ -1098,9 +1098,9 @@ class ReplApplication(Cmd, ConsoleApplication):
fields = None
try:
self.formatter.format(obj=result, selected_fields=fields, alias=alias)
except FieldNotFound, e:
except FieldNotFound as e:
print >>sys.stderr, e
except MandatoryFieldsNotFound, e:
except MandatoryFieldsNotFound as e:
print >>sys.stderr, '%s Hint: select missing fields or use another formatter (ex: multiline).' % e
def flush(self):

2
weboob/tools/backend.py
View file

@ -163,7 +163,7 @@ class BackendConfig(ValuesDict):
field = copy(field)
try:
field.load(cfg.instname, value, cfg.weboob.callbacks)
except ValueError, v:
except ValueError as v:
if not nofail:
raise BaseBackend.ConfigError(
'Backend(%s): Configuration error for field "%s": %s' % (cfg.instname, name, v))

20
weboob/tools/browser/browser.py
View file

@ -55,7 +55,7 @@ from weboob.tools.parsers import get_parser
# Try to load cookies
try:
from .firefox_cookies import FirefoxCookieJar
except ImportError, e:
except ImportError as e:
warning("Unable to store cookies: %s" % e)
HAVE_COOKIES = False
else:
@ -281,7 +281,7 @@ class StandardBrowser(mechanize.Browser):
try:
return self._openurl(*args, **kwargs)
except (mechanize.BrowserStateError, mechanize.response_seek_wrapper,
urllib2.HTTPError, urllib2.URLError, BadStatusLine, ssl.SSLError), e:
urllib2.HTTPError, urllib2.URLError, BadStatusLine, ssl.SSLError) as e:
if isinstance(e, mechanize.BrowserStateError) and hasattr(self, 'home'):
self.home()
return self._openurl(*args, **kwargs)
@ -289,7 +289,7 @@ class StandardBrowser(mechanize.Browser):
raise self.get_exception(e)('%s (url="%s")' % (e, args and args[0] or 'None'))
else:
return None
except BrowserRetry, e:
except BrowserRetry as e:
return self._openurl(*args, **kwargs)
def get_exception(self, e):
@ -426,7 +426,7 @@ class StandardBrowser(mechanize.Browser):
if isinstance(is_list, (list, tuple)):
try:
value = [self.str(is_list.index(args[label]))]
except ValueError, e:
except ValueError as e:
if args[label]:
print >>sys.stderr, '[%s] %s: %s' % (label, args[label], e)
return
@ -555,10 +555,10 @@ class BaseBrowser(StandardBrowser):
nologin = kwargs.pop('nologin', False)
try:
self._change_location(mechanize.Browser.submit(self, *args, **kwargs), no_login=nologin)
except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError, BadStatusLine, ssl.SSLError), e:
except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError, BadStatusLine, ssl.SSLError) as e:
self.page = None
raise self.get_exception(e)(e)
except (mechanize.BrowserStateError, BrowserRetry), e:
except (mechanize.BrowserStateError, BrowserRetry) as e:
raise BrowserUnavailable(e)
def is_on_page(self, pageCls):
@ -587,10 +587,10 @@ class BaseBrowser(StandardBrowser):
"""
try:
self._change_location(mechanize.Browser.follow_link(self, *args, **kwargs))
except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError, BadStatusLine, ssl.SSLError), e:
except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError, BadStatusLine, ssl.SSLError) as e:
self.page = None
raise self.get_exception(e)('%s (url="%s")' % (e, args and args[0] or 'None'))
except (mechanize.BrowserStateError, BrowserRetry), e:
except (mechanize.BrowserStateError, BrowserRetry) as e:
self.home()
raise BrowserUnavailable(e)
@ -622,7 +622,7 @@ class BaseBrowser(StandardBrowser):
if not self.page or not args or self.page.url != args[0]:
keep_kwargs['no_login'] = True
self.location(*keep_args, **keep_kwargs)
except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError, BadStatusLine, ssl.SSLError), e:
except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError, BadStatusLine, ssl.SSLError) as e:
self.page = None
raise self.get_exception(e)('%s (url="%s")' % (e, args and args[0] or 'None'))
except mechanize.BrowserStateError:
@ -758,7 +758,7 @@ class HTTPSConnection2(httplib.HTTPSConnection):
self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file, ssl_version=proto)
self._HOSTS['%s:%s' % (self.host, self.port)] = [proto]
return
except ssl.SSLError, e:
except ssl.SSLError as e:
sock.close()
raise e

4
weboob/tools/browser/firefox_cookies.py
View file

@ -20,7 +20,7 @@
try:
import sqlite3 as sqlite
except ImportError, e:
except ImportError as e:
from pysqlite2 import dbapi2 as sqlite
from mechanize import CookieJar, Cookie
@ -39,7 +39,7 @@ class FirefoxCookieJar(CookieJar):
def __connect(self):
try:
db = sqlite.connect(database=self.sqlite_file, timeout=10.0)
except sqlite.OperationalError, err:
except sqlite.OperationalError as err:
print 'Unable to open %s database: %s' % (self.sqlite_file, err)
return None

2
weboob/tools/capabilities/bank/transactions.py
View file

@ -152,7 +152,7 @@ class FrenchTransaction(Transaction):
self.rdate = datetime.datetime(yy, mm, dd, int(args['HH']), int(args['MM']))
else:
self.rdate = datetime.date(yy, mm, dd)
except ValueError, e:
except ValueError as e:
self._logger.warning('Unable to date in label %r: %s' % (self.raw, e))
return

6
weboob/tools/date.py
View file

@ -83,7 +83,7 @@ def _findall(text, substr):
# Also finds overlaps
sites = []
i = 0
while 1:
while True:
j = text.find(substr, i)
if j == -1:
break
@ -153,10 +153,10 @@ class LinearDateGuesser(object):
In case initialization still fails with max_year, this function raises
a ValueError.
"""
while 1:
while True:
try:
return date(start_year, month, day)
except ValueError, e:
except ValueError as e:
if start_year == max_year:
raise e
start_year += cmp(max_year, start_year)

2
weboob/tools/decorators.py
View file

@ -41,7 +41,7 @@ def retry(ExceptionToCheck, tries=4, delay=3, backoff=2):
return f(*args, **kwargs)
try_one_last_time = False
break
except ExceptionToCheck, e:
except ExceptionToCheck as e:
logging.debug(u'%s, Retrying in %d seconds...' % (e, mdelay))
time.sleep(mdelay)
mtries -= 1