merge LoginPage and Login2Page to prevent problems when the website fails with 500

modules/ing/browser.py

@@ -20,7 +20,7 @@ import hashlib
 
 from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword
 from weboob.capabilities.bank import Account, TransferError
-from .pages import AccountsList, LoginPage, LoginPage2, \
+from .pages import AccountsList, LoginPage, \
                    AccountHistory, TransferPage, TransferConfirmPage, \
                    BillsPage, StopPage
 
@@ -35,8 +35,7 @@ class Ing(BaseBrowser):
     #DEBUG_HTTP = True
     ENCODING = None  # refer to the HTML encoding
     PAGES = {'.*displayTRAccountSummary.*':    AccountsList,
-             '.*displayLogin.jsf':             LoginPage,
-             '.*displayLogin.jsf.+':           LoginPage2,
+             '.*displayLogin.jsf.*':           LoginPage,
              '.*accountDetail.jsf.*':          AccountHistory,
              '.*displayTRHistorique.*':        AccountHistory,
              '.*transferManagement.jsf':       TransferPage,

modules/ing/pages/__init__.py

@@ -20,7 +20,7 @@
 
 from .accounts_list import AccountsList
 from .account_history import AccountHistory
-from .login import LoginPage, LoginPage2, StopPage
+from .login import LoginPage, StopPage
 from .transfer import TransferPage, TransferConfirmPage
 from .bills import BillsPage
 
@@ -29,6 +29,5 @@ class AccountPrelevement(AccountsList):
     pass
 
 __all__ = ['AccountsList', 'AccountHistory', 'LoginPage',
-           'LoginPage2', 'AccountPrelevement',
-           'TransferPage', 'TransferConfirmPage',
+           'AccountPrelevement', 'TransferPage', 'TransferConfirmPage',
            'BillsPage', 'StopPage']

modules/ing/pages/login.py

@@ -26,7 +26,7 @@ from weboob.tools.captcha.virtkeyboard import VirtKeyboard, VirtKeyboardError
 import tempfile
 
 
-__all__ = ['LoginPage', 'LoginPage2', 'INGVirtKeyboard', 'StopPage']
+__all__ = ['LoginPage', 'INGVirtKeyboard', 'StopPage']
 
 
 class INGVirtKeyboard(VirtKeyboard):
@@ -108,10 +108,6 @@ class LoginPage(BasePage):
         return err is not None
 
 
-class LoginPage2(BasePage):
-    def on_loaded(self):
-        pass
-
     def login(self, password):
         # 2) And now, the virtual Keyboard
         try: