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

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

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)

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

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