From ab8528c517df268ac926ff42a841cc9ba9384ebb Mon Sep 17 00:00:00 2001 From: sputnick Date: Tue, 1 May 2012 02:04:32 +0200 Subject: [PATCH] support for fortuneo "current account" --- modules/fortuneo/browser.py | 2 ++ modules/fortuneo/pages/accounts_list.py | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/fortuneo/browser.py b/modules/fortuneo/browser.py index 60fe596e..8cd8b3b8 100644 --- a/modules/fortuneo/browser.py +++ b/modules/fortuneo/browser.py @@ -38,6 +38,8 @@ class Fortuneo(BaseBrowser): AccountsList, '.*/prive/mes-comptes/livret/consulter-situation/consulter-solde\.jsp\?COMPTE_ACTIF=.*': AccountHistoryPage, + '.*/prive/mes-comptes/compte-courant/consulter-situation/consulter-solde\.jsp\?COMPTE_ACTIF=.*': + AccountHistoryPage, '.*/prive/default\.jsp.*': AccountsList } diff --git a/modules/fortuneo/pages/accounts_list.py b/modules/fortuneo/pages/accounts_list.py index dc9af018..690c6b2b 100644 --- a/modules/fortuneo/pages/accounts_list.py +++ b/modules/fortuneo/pages/accounts_list.py @@ -23,7 +23,7 @@ import datetime from weboob.capabilities.bank import Account from weboob.tools.capabilities.bank.transactions import Transaction -from weboob.tools.browser import BasePage, BrokenPageError +from weboob.tools.browser import BasePage#, BrokenPageError from weboob.capabilities import NotAvailable @@ -38,7 +38,7 @@ class AccountHistoryPage(BasePage): tables = self.document.findall(".//*[@id='tabHistoriqueOperations']/tbody/tr") if len(tables) == 0: - raise BrokenPageError + return [] for i in range(len(tables)): operation = Transaction(len(operations)) @@ -87,10 +87,9 @@ class AccountsList(BasePage): # account._link_id url_to_parse = cpt.xpath('./td[1]/a/@href')[0] # link - compte_id_re = re.compile(r'.*COMPTE_ACTIF=([^\&]+)\&.*') - account._link_id = '/fr/prive/mes-comptes/livret/consulter-situation/consulter-solde.jsp?COMPTE_ACTIF='+ \ - compte_id_re.search(url_to_parse).groups()[0] - account._link_id = account._link_id + compte_id_re = re.compile(r'/prive/mes-comptes/([^/]+/).*COMPTE_ACTIF=([^\&]+)\&?') + account._link_id = '/fr/prive/mes-comptes/%sconsulter-situation/consulter-solde.jsp?COMPTE_ACTIF=%s' % \ + (compte_id_re.search(url_to_parse).groups()[0], compte_id_re.search(url_to_parse).groups()[1]) # account.label tpl = cpt.xpath("./td[2]/a/text()")[0].split(' ')