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

2
modules/gdcvault/browser.py
View file

@ -97,7 +97,7 @@ class GDCVaultBrowser(BaseBrowser):
try:
self.open_novisit(url)
#headers = req.info()
except HTTPError, e:
except HTTPError as e:
# print e.getcode()
if e.getcode() == 302 and hasattr(e, 'hdrs'):
#print e.hdrs['Location']

10
modules/gdcvault/pages.py
View file

@ -113,7 +113,7 @@ class VideoPage(BasePage):
if len(obj) > 0:
try:
title = unicode(obj[0].text)
except UnicodeDecodeError, e:
except UnicodeDecodeError as e:
title = None
@ -125,7 +125,7 @@ class VideoPage(BasePage):
# FIXME: 1013483 has buggus title (latin1)
# for now we just pass it as-is
title = obj[0].attrib['content']
except UnicodeDecodeError, e:
except UnicodeDecodeError as e:
# XXX: this doesn't even works!?
title = obj[0].attrib['content'].decode('iso-5589-15')
@ -172,7 +172,7 @@ class VideoPage(BasePage):
#print req.code
except HTTPError, e:
except HTTPError as e:
#print e.getcode()
if e.getcode() == 302 and hasattr(e, 'hdrs'):
#print e.hdrs['Location']
@ -218,7 +218,7 @@ class VideoPage(BasePage):
self.browser.set_handle_redirect(False)
try:
self.browser.open_novisit(video.url)
except HTTPError, e:
except HTTPError as e:
if e.getcode() == 302 and hasattr(e, 'hdrs'):
video.url = unicode(e.hdrs['Location'])
self.browser.set_handle_redirect(True)
@ -298,7 +298,7 @@ class VideoPage(BasePage):
# 1016634 has "Invalid Date"
try:
video.date = parse_dt(obj.text)
except ValueError, e:
except ValueError as e:
video.date = NotAvailable
obj = self.parser.select(config.getroot(), 'duration', 1)