Use newer form of catching exceptions

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

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 weboob.core import Weboob
@ -35,13 +35,13 @@ def main(filename):
weboob = Weboob()
try:
hds = weboob.build_backend('hds')
except ModuleLoadError, e:
except ModuleLoadError as e:
print >>sys.stderr, 'Unable to load "hds" module: %s' % e
return 1
try:
db = sqlite.connect(database=filename, timeout=10.0)
except sqlite.OperationalError, err:
except sqlite.OperationalError as err:
print >>sys.stderr, 'Unable to open %s database: %s' % (filename, err)
return 1
@ -49,7 +49,7 @@ def main(filename):
sys.stdout.flush()
try:
results = db.execute('SELECT id, author FROM stories')
except sqlite.OperationalError, err:
except sqlite.OperationalError as err:
print >>sys.stderr, 'fail!\nUnable to read database: %s' % err
return 1