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/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()