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

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)