nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bnppe: do not crash with securities accounts

Browse source
This commit is contained in:
Romain Bignon 2013-07-28 16:01:41 +02:00
commit b0498473fb
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/bnporc/enterprise/browser.py
View file

@ -73,9 +73,12 @@ class BNPEnterprise(BaseBrowser):
yield a yield a
def iter_history(self, account): def iter_history(self, account):
if not self.is_on_page(HistoryPage): if account._link_id is None:
self.location('/ROP?Action=F_RELCO&ch4=%s&ch8=2000' % account._link_id) return
d1, d2 = self.page.get_date_range()
self.location('/ROP?Action=F_RELCO&ch4=%s&ch5=%s&ch9=%s&ch8=2000' % (account._link_id, d1, d2)) self.location('/ROP?Action=F_RELCO&ch4=%s&ch8=2000' % account._link_id)
d1, d2 = self.page.get_date_range()
self.location('/ROP?Action=F_RELCO&ch4=%s&ch5=%s&ch9=%s&ch8=2000' % (account._link_id, d1, d2))
for transaction in self.page.iter_history(): for transaction in self.page.iter_history():
yield transaction yield transaction

13
modules/bnporc/enterprise/pages.py
View file

@ -23,7 +23,7 @@ from urlparse import parse_qs
from datetime import datetime from datetime import datetime
from weboob.capabilities.bank import Account from weboob.capabilities.bank import Account
from weboob.tools.browser import BasePage from weboob.tools.browser import BasePage, BrokenPageError
from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.capabilities.bank.transactions import FrenchTransaction
from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard, VirtKeyboardError from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard, VirtKeyboardError
from weboob.tools.misc import to_unicode from weboob.tools.misc import to_unicode
@ -117,7 +117,7 @@ class AccountsPage(BEPage):
def find_table(self): def find_table(self):
for table in self.parser.select(self.document.getroot(), 'table', 'many'): for table in self.parser.select(self.document.getroot(), 'table', 'many'):
for td in self.parser.select(table, 'tr td'): for td in self.parser.select(table, 'tr td'):
if td.text and td.text.strip().startswith('COMPTES COURANTS'): if td.text and td.text.strip().startswith('COMPTES '):
return table return table
def get_list(self): def get_list(self):
@ -132,8 +132,13 @@ class AccountsPage(BEPage):
account.label = to_unicode(tdlabel.text_content().strip()) account.label = to_unicode(tdlabel.text_content().strip())
# this is important - and is also the last part of the id (considering spaces) # this is important - and is also the last part of the id (considering spaces)
# we can't use only the link as it does not goes where we want # we can't use only the link as it does not goes where we want
link = self.parser.select(tdlabel, 'a', 1) try:
account._link_id = parse_qs(link.attrib['href'])['ch4'][0] link = self.parser.select(tdlabel, 'a', 1)
except BrokenPageError:
# probably an account we can't display the history
account._link_id = None
else:
account._link_id = parse_qs(link.attrib['href'])['ch4'][0]
account.id = to_unicode(tdid.text.strip().replace(' ', '')) account.id = to_unicode(tdid.text.strip().replace(' ', ''))
# just in case we are showing the converted balances # just in case we are showing the converted balances
account._main_currency = Account.get_currency(tdcur.text) account._main_currency = Account.get_currency(tdcur.text)