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.

contrib/hds/export.py

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

modules/aum/backend.py

@@ -301,7 +301,7 @@ class AuMBackend(BaseBackend, ICapMessages, ICapMessagesPost, ICapDating, ICapCh
                                               children=[],
                                               flags=Message.IS_UNREAD)
                         yield thread.root
-        except BrowserUnavailable, e:
+        except BrowserUnavailable as e:
             self.logger.debug('No messages, browser is unavailable: %s' % e)
             pass  # don't care about waiting
 

modules/aum/captcha.py

@@ -197,7 +197,7 @@ class Decoder(object):
 
     def main(self):
         try:
-            while 1:
+            while True:
                 self.process()
         except KeyboardInterrupt:
             print ''

modules/aum/optim/priority_connection.py

@@ -131,7 +131,7 @@ class PriorityConnection(Optimization):
                                      zipcode=    75001,
                                      country=    'fr',
                                      godfather=  my_id)
-                except AccountRegisterError, e:
+                except AccountRegisterError as e:
                     self.logger.warning('Unable to register account: %s' % e)
                 except CaptchaError:
                     self.logger.warning('Unable to solve captcha... Retrying')
@@ -156,12 +156,12 @@ class PriorityConnection(Optimization):
             fakes = self.storage.get('priority_connection', 'fakes', default={})
             if len(fakes) == 0:
                 return
-            while 1:
+            while True:
                 name = random.choice(fakes.keys())
                 fake = fakes[name]
                 try:
                     browser = AuMBrowser(fake['username'], fake['password'], proxy=self.browser.proxy)
-                except (AdopteBanned,BrowserIncorrectPassword), e:
+                except (AdopteBanned,BrowserIncorrectPassword) as e:
                     self.logger.warning('Fake %s can\'t login: %s' % (name, e))
                     continue
 

modules/aum/optim/profiles_walker.py

@@ -97,7 +97,7 @@ class ProfilesWalker(Optimization):
                 # We consider this profil hasn't been [correctly] analysed
                 self.profiles_queue.add(id)
                 return
-            except Exception, e:
+            except Exception as e:
                 print e
         finally:
             if self.view_cron is not None:

modules/aum/optim/visibility.py

@@ -47,6 +47,6 @@ class Visibility(Optimization):
         try:
             with self.browser:
                 self.browser.login()
-        except BrowserUnavailable, e:
+        except BrowserUnavailable as e:
             print str(e)
             pass

modules/banquepopulaire/browser.py

@@ -103,7 +103,7 @@ class BanquePopulaire(BaseBrowser):
             account = self.get_account(account.id)
         self.location('/cyber/internet/ContinueTask.do', urllib.urlencode(account._params))
 
-        while 1:
+        while True:
             assert self.is_on_page(TransactionsPage)
 
             for tr in self.page.get_history():

modules/bnporc/enterprise/pages.py

@@ -101,7 +101,7 @@ class LoginPage(BEPage):
     def login(self, login, password):
         try:
             vk = BNPVirtKeyboard(self)
-        except VirtKeyboardError, err:
+        except VirtKeyboardError as err:
             self.logger.error("Error: %s" % err)
             return False
 

modules/bnporc/perso/login.py

@@ -74,7 +74,7 @@ class LoginPage(BasePage):
     def login(self, login, password):
         try:
             vk=BNPVirtKeyboard(self)
-        except VirtKeyboardError, err:
+        except VirtKeyboardError as err:
             self.logger.error("Error: %s"%err)
             return False
 
@@ -111,7 +111,7 @@ class ChangePasswordPage(BasePage):
     def change_password(self, current, new):
         try:
             vk=BNPVirtKeyboard(self)
-        except VirtKeyboardError, err:
+        except VirtKeyboardError as err:
             self.logger.error("Error: %s"%err)
             return False
 

modules/bp/browser.py

@@ -128,7 +128,7 @@ class BPBrowser(BaseBrowser):
         """
         ops = self.page.get_history(deferred=True)
 
-        while 1:
+        while True:
             for tr in ops:
                 yield tr
 

modules/bp/pages/transfer.py

@@ -55,7 +55,7 @@ class TransferSummary(BasePage):
         #HACK for deal with bad encoding ...
         try:
             text = p.text
-        except UnicodeDecodeError, error:
+        except UnicodeDecodeError as error:
             text = error.object.strip()
 
         match = re.search("Votre virement N.+ ([0-9]+) ", text)

modules/caissedepargne/browser.py

@@ -104,7 +104,7 @@ class CaisseEpargne(BaseBrowser):
 
         self.page.go_history(info)
 
-        while 1:
+        while True:
             assert self.is_on_page(IndexPage)
 
             for tr in self.page.get_history():

modules/creditcooperatif/pro/browser.py

@@ -86,7 +86,7 @@ class CreditCooperatif(BaseBrowser):
     def get_history(self, account):
         self.location('/banque/cpt/cpt/situationcomptes.do?lnkReleveAction=X&numeroExterne='+ account.id)
 
-        while 1:
+        while True:
             assert self.is_on_page(TransactionsPage)
 
             for tr in self.page.get_history():

modules/creditdunord/pages.py

@@ -52,7 +52,7 @@ class CDNBasePage(BasePage):
             if start < 0:
                 continue
 
-            while 1:
+            while True:
                 if value is None:
                     value = ''
                 else:

modules/dlfp/browser.py

@@ -189,7 +189,7 @@ class DLFP(BaseBrowser):
 
         try:
             self.submit()
-        except BrowserHTTPError, e:
+        except BrowserHTTPError as e:
             raise CantSendMessage('Unable to send message to %s.%s: %s' % (thread, reply_id, e))
 
         if self.is_on_page(NodePage):

modules/gdcvault/browser.py

@@ -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']

modules/gdcvault/pages.py

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

modules/hellobank/perso/login.py

@@ -86,7 +86,7 @@ class LoginPage(BasePage):
     def login(self, login, password):
         try:
             vk=HelloBankVirtKeyboard(self)
-        except VirtKeyboardError,err:
+        except VirtKeyboardError as err:
             self.logger.error("Error: %s"%err)
             return False
 

modules/ing/browser.py

@@ -133,7 +133,7 @@ class Ing(BaseBrowser):
 
         index = 0 # index, we get always the same page, but with more informations
         hashlist = []
-        while 1:
+        while True:
             i = index
             for transaction in self.page.get_transactions(index):
                 while transaction.id in hashlist:
@@ -227,7 +227,7 @@ class Ing(BaseBrowser):
                 "transfer_issuer_radio": subscription.id
                }
         self.location(self.billpage, urllib.urlencode(data))
-        while 1:
+        while True:
             for bill in self.page.iter_bills(subscription.id):
                 yield bill
             if self.page.islast():

modules/ing/pages/login.py

@@ -107,7 +107,7 @@ class LoginPage(BasePage):
         # 2) And now, the virtual Keyboard
         try:
             vk = INGVirtKeyboard(self)
-        except VirtKeyboardError, err:
+        except VirtKeyboardError as err:
             error("Error: %s" % err)
             return False
         realpasswd = ""