diff --git a/modules/ing/backend.py b/modules/ing/backend.py index 72e1da8e..809d1b28 100644 --- a/modules/ing/backend.py +++ b/modules/ing/backend.py @@ -19,9 +19,9 @@ from weboob.capabilities.bank import ICapBank, AccountNotFound,\ - Account, Recipient + Account, Recipient from weboob.capabilities.bill import ICapBill, Bill, Subscription,\ - SubscriptionNotFound, BillNotFound + SubscriptionNotFound, BillNotFound from weboob.capabilities.base import UserError from weboob.tools.backend import BaseBackend, BackendConfig from weboob.tools.value import ValueBackendPassword @@ -48,7 +48,7 @@ class INGBackend(BaseBackend, ICapBank, ICapBill): label='Date de naissance', regexp='^(\d{8}|)$', masked=False) - ) + ) BROWSER = IngBrowser def create_default_browser(self): diff --git a/modules/ing/browser.py b/modules/ing/browser.py index 3d1799cc..17377ac5 100644 --- a/modules/ing/browser.py +++ b/modules/ing/browser.py @@ -22,10 +22,8 @@ from weboob.tools.browser2 import LoginBrowser, URL, need_login from weboob.tools.browser import BrowserIncorrectPassword from weboob.capabilities.bank import Account, TransferError -from .pages import AccountsList, LoginPage, \ - TransferPage, TransferConfirmPage, \ - BillsPage, StopPage, TitrePage, \ - TitreHistory +from .pages import AccountsList, LoginPage, TitrePage, TitreHistory,\ + TransferPage, TransferConfirmPage, BillsPage, StopPage __all__ = ['IngBrowser'] @@ -51,7 +49,6 @@ class IngBrowser(LoginBrowser): titrehistory = URL('https://bourse.ingdirect.fr/priv/compte.php\?ong=3', TitreHistory) titrerealtime = URL('https://bourse.ingdirect.fr/streaming/compteTempsReelCK.php', TitrePage) - # CapBill billpage = URL('/protected/pages/common/estatement/eStatement.jsf', BillsPage) @@ -121,7 +118,7 @@ class IngBrowser(LoginBrowser): self.logger.info('There is no history for this account') return - index = 0 # index, we get always the same page, but with more informations + index = 0 # index, we get always the same page, but with more informations hashlist = [] while True: i = index @@ -198,7 +195,6 @@ class IngBrowser(LoginBrowser): self.where = "titre" self.titrepage.go() - def get_investments(self, account): if account.type != Account.TYPE_MARKET: raise NotImplementedError() @@ -212,7 +208,6 @@ class IngBrowser(LoginBrowser): self.titrehistory.go() return self.page.iter_history() - ############# CapBill ############# @need_login def get_subscriptions(self): @@ -227,7 +222,7 @@ class IngBrowser(LoginBrowser): "autoScroll": "", "javax.faces.ViewState": subscription._javax, "transfer_issuer_radio": subscription.id - } + } self.billpage.go(data=data) return self.page.iter_bills(subid=subscription.id) diff --git a/modules/ing/pages/bills.py b/modules/ing/pages/bills.py index 24608122..a6b3ae21 100644 --- a/modules/ing/pages/bills.py +++ b/modules/ing/pages/bills.py @@ -25,6 +25,7 @@ from weboob.tools.browser2.page import ListElement, ItemElement, method __all__ = ['BillsPage'] + class FormId(Filter): def filter(self, txt): formid = txt.split("parameters")[1] @@ -45,7 +46,6 @@ class BillsPage(LoggedPage, HTMLPage): obj_label = CleanText('label') obj__formid = FormId(Attr('input', 'onclick')) - def postpredown(self, _id): _id = _id.split("'")[5] form = self.get_form(name="statements_form") @@ -60,8 +60,7 @@ class BillsPage(LoggedPage, HTMLPage): class item(ItemElement): klass = Bill - def condition(self): - return not (u"tous les relev" in CleanText('a[1]')(self.el)) + condition = lambda self: not (u"tous les relev" in CleanText('a[1]')(self.el)) obj_label = CleanText('a[1]', replace=[(' ', '-')]) obj_id = Format(u"%s-%s", Env('subid'), Field('label')) diff --git a/modules/ing/pages/login.py b/modules/ing/pages/login.py index e90537eb..c0220714 100644 --- a/modules/ing/pages/login.py +++ b/modules/ing/pages/login.py @@ -39,7 +39,7 @@ class INGVirtKeyboard(VirtKeyboard): '7': 'fb495b5cf7f46201af0b4977899b56d4', '8': 'e8fea1e1aa86f8fca7f771db9a1dca4d', '9': '82e63914f2e52ec04c11cfc6fecf7e08' - } + } color = 64 def __init__(self, basepage):