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

Account.link_id becomes a private attribute

Browse source
This commit is contained in:
Romain Bignon 2012-03-10 09:03:26 +01:00
commit 35688f58c9
18 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/bnporc/backend.py
View file

@ -76,11 +76,11 @@ class BNPorcBackend(BaseBackend, ICapBank):
def iter_history(self, account): def iter_history(self, account):
with self.browser: with self.browser:
return self.browser.iter_history(account.link_id) return self.browser.iter_history(account._link_id)
def iter_operations(self, account): def iter_operations(self, account):
with self.browser: with self.browser:
return self.browser.iter_coming_operations(account.link_id) return self.browser.iter_coming_operations(account._link_id)
def iter_transfer_recipients(self, ignored): def iter_transfer_recipients(self, ignored):
for account in self.browser.get_transfer_accounts().itervalues(): for account in self.browser.get_transfer_accounts().itervalues():

5
modules/bnporc/browser.py
View file

@ -76,6 +76,8 @@ class BNPorc(BaseBrowser):
if self.is_on_page(LoginPage): if self.is_on_page(LoginPage):
raise BrowserIncorrectPassword() raise BrowserIncorrectPassword()
#self.readurl('/SAF_SOA?Action=6')
def change_password(self, new_password): def change_password(self, new_password):
assert new_password.isdigit() and len(new_password) == 6 assert new_password.isdigit() and len(new_password) == 6
@ -85,6 +87,9 @@ class BNPorc(BaseBrowser):
self.location(buf) self.location(buf)
assert self.is_on_page(ChangePasswordPage) assert self.is_on_page(ChangePasswordPage)
#self.readurl('/banque/portail/particulier/bandeau')
#self.readurl('/common/vide.htm')
self.page.change_password(self.password, new_password) self.page.change_password(self.password, new_password)
if not self.is_on_page(ConfirmPage) or self.page.get_error() is not None: if not self.is_on_page(ConfirmPage) or self.page.get_error() is not None:

2
modules/bnporc/pages/accounts_list.py
View file

@ -38,7 +38,7 @@ class AccountsList(BasePage):
if tr.find('td') is not None and tr.find('td').attrib.get('class', '') == 'typeTitulaire': if tr.find('td') is not None and tr.find('td').attrib.get('class', '') == 'typeTitulaire':
account = Account() account = Account()
account.id = tr.xpath('.//td[@class="libelleCompte"]/input')[0].attrib['id'][len('libelleCompte'):] account.id = tr.xpath('.//td[@class="libelleCompte"]/input')[0].attrib['id'][len('libelleCompte'):]
account.link_id = account.id account._link_id = account.id
if len(str(account.id)) == 23: if len(str(account.id)) == 23:
account.id = str(account.id)[5:21] account.id = str(account.id)[5:21]

7
modules/bnporc/pages/login.py
View file

@ -18,6 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
import time
import re import re
from weboob.tools.mech import ClientForm from weboob.tools.mech import ClientForm
import urllib import urllib
@ -41,13 +42,13 @@ class BNPVirtKeyboard(MappedVirtKeyboard):
'9':'828cf0faf86ac78e7f43208907620527' '9':'828cf0faf86ac78e7f43208907620527'
} }
url="/NSImgGrille" url="/NSImgGrille?timestamp=%d"
color=27 color=27
def __init__(self,basepage): def __init__(self,basepage):
img=basepage.document.find("//img[@usemap='#MapGril']") img=basepage.document.find("//img[@usemap='#MapGril']")
MappedVirtKeyboard.__init__(self,basepage.browser.openurl(self.url),basepage.document,img,self.color) MappedVirtKeyboard.__init__(self,basepage.browser.openurl(self.url % time.time()),basepage.document,img,self.color)
if basepage.browser.responses_dirname is None: if basepage.browser.responses_dirname is None:
basepage.browser.responses_dirname = \ basepage.browser.responses_dirname = \
tempfile.mkdtemp(prefix='weboob_session_') tempfile.mkdtemp(prefix='weboob_session_')
@ -135,7 +136,7 @@ class ChangePasswordPage(BasePage):
code_current=vk.get_string_code(current) code_current=vk.get_string_code(current)
code_new=vk.get_string_code(new) code_new=vk.get_string_code(new)
data = (('ch1', code_current.replace('4', '3')), data = (('ch1', code_current),
('ch2', code_new), ('ch2', code_new),
('radiobutton3', 'radiobutton'), ('radiobutton3', 'radiobutton'),
('ch3', code_new), ('ch3', code_new),

6
modules/boursorama/browser.py
View file

@ -81,15 +81,15 @@ class Boursorama(BaseBrowser):
return None return None
def get_history(self, account): def get_history(self, account):
self.location(account.link_id) self.location(account._link_id)
operations = self.page.get_operations() operations = self.page.get_operations()
# load last month as well # load last month as well
target = date.today() - relativedelta( months = 1 ) target = date.today() - relativedelta( months = 1 )
self.location(account.link_id + ("&month=%d&year=%d" % (target.month, target.year))) self.location(account._link_id + ("&month=%d&year=%d" % (target.month, target.year)))
operations += self.page.get_operations() operations += self.page.get_operations()
# and the month before, just in case you're greedy # and the month before, just in case you're greedy
target = date.today() - relativedelta( months = 2 ) target = date.today() - relativedelta( months = 2 )
self.location(account.link_id + ("&month=%d&year=%d" % (target.month, target.year))) self.location(account._link_id + ("&month=%d&year=%d" % (target.month, target.year)))
operations += self.page.get_operations() operations += self.page.get_operations()
for index, op in enumerate(operations): for index, op in enumerate(operations):
op.id = index op.id = index

2
modules/boursorama/pages/accounts_list.py
View file

@ -40,7 +40,7 @@ class AccountsList(BasePage):
elif td.attrib.get('class', '') == 'account-name': elif td.attrib.get('class', '') == 'account-name':
a = td.find('a') a = td.find('a')
account.label = a.text account.label = a.text
account.link_id = a.get('href', '') account._link_id = a.get('href', '')
elif td.attrib.get('class', '') == 'account-number': elif td.attrib.get('class', '') == 'account-number':
id = td.text id = td.text

2
modules/bp/browser.py
View file

@ -90,7 +90,7 @@ class BPBrowser(BaseBrowser):
return self.page.get_account(id) return self.page.get_account(id)
def get_history(self, Account): def get_history(self, Account):
self.location(Account.link_id) self.location(Account._link_id)
return self.page.get_history() return self.page.get_history()
def make_transfer(self, from_account, to_account, amount): def make_transfer(self, from_account, to_account, amount):

2
modules/bp/pages/accountlist.py
View file

@ -48,7 +48,7 @@ class AccountList(BasePage):
account = Account() account = Account()
tmp = line.xpath("./td//a")[0] tmp = line.xpath("./td//a")[0]
account.label = tmp.text account.label = tmp.text
account.link_id = tmp.get("href") account._link_id = tmp.get("href")
tmp = line.xpath("./td/span/strong") tmp = line.xpath("./td/span/strong")
if len(tmp) >= 2: if len(tmp) >= 2:

6
modules/cragr/browser.py
View file

@ -132,9 +132,9 @@ class Cragr(BaseBrowser):
def get_history(self, account): def get_history(self, account):
# some accounts may exist without a link to any history page # some accounts may exist without a link to any history page
if account.link_id is None: if account._link_id is None:
return return
history_url = account.link_id history_url = account._link_id
operations_count = 0 operations_count = 0
# 1st, go on the account page # 1st, go on the account page
@ -258,5 +258,5 @@ class Cragr(BaseBrowser):
#def get_coming_operations(self, account): #def get_coming_operations(self, account):
# if not self.is_on_page(AccountComing) or self.page.account.id != account.id: # if not self.is_on_page(AccountComing) or self.page.account.id != account.id:
# self.location('/NS_AVEEC?ch4=%s' % account.link_id) # self.location('/NS_AVEEC?ch4=%s' % account._link_id)
# return self.page.get_operations() # return self.page.get_operations()

7
modules/cragr/pages/accounts_list.py
View file

@ -45,11 +45,12 @@ class AccountsList(CragrBasePage):
for div in self.document.getiterator('div'): for div in self.document.getiterator('div'):
if div.attrib.get('class', '') == 'dv' and div.getchildren()[0].tag in ('a', 'br'): if div.attrib.get('class', '') == 'dv' and div.getchildren()[0].tag in ('a', 'br'):
account = Account() account = Account()
account._link_id = None
if div.getchildren()[0].tag == 'a': if div.getchildren()[0].tag == 'a':
# This is at least present on CA Nord-Est # This is at least present on CA Nord-Est
# Note: we do not know yet how history-less accounts are displayed by this layout # Note: we do not know yet how history-less accounts are displayed by this layout
account.label = ' '.join(div.find('a').text.split()[:-1]) account.label = ' '.join(div.find('a').text.split()[:-1])
account.link_id = div.find('a').get('href', '') account._link_id = div.find('a').get('href', '')
account.id = div.find('a').text.split()[-1] account.id = div.find('a').text.split()[-1]
s = div.find('div').find('b').find('span').text s = div.find('div').find('b').find('span').text
else: else:
@ -57,12 +58,12 @@ class AccountsList(CragrBasePage):
first_link = div.find('a') first_link = div.find('a')
if first_link is not None: if first_link is not None:
account.label = first_link.text.strip() account.label = first_link.text.strip()
account.link_id = first_link.get('href', '') account._link_id = first_link.get('href', '')
s = div.find('div').find('b').text s = div.find('div').find('b').text
else: else:
# there is no link to any history page for accounts like "PEA" or "TITRES" # there is no link to any history page for accounts like "PEA" or "TITRES"
account.label = div.findall('br')[0].tail.strip() account.label = div.findall('br')[0].tail.strip()
account.link_id = None account._link_id = None
s = div.xpath('following-sibling::div//b')[0].text s = div.xpath('following-sibling::div//b')[0].text
account.id = div.findall('br')[1].tail.strip() account.id = div.findall('br')[1].tail.strip()
account.balance = clean_amount(s) account.balance = clean_amount(s)

4
modules/creditmutuel/browser.py
View file

@ -93,7 +93,7 @@ class CreditMutuelBrowser(BaseBrowser):
self.currentSubBank = subbank self.currentSubBank = subbank
def get_history(self, account): def get_history(self, account):
page_url = account.link_id page_url = account._link_id
#operations_count = 0 #operations_count = 0
l_ret = [] l_ret = []
while (page_url): while (page_url):
@ -170,5 +170,5 @@ class CreditMutuelBrowser(BaseBrowser):
#def get_coming_operations(self, account): #def get_coming_operations(self, account):
# if not self.is_on_page(AccountComing) or self.page.account.id != account.id: # if not self.is_on_page(AccountComing) or self.page.account.id != account.id:
# self.location('/NS_AVEEC?ch4=%s' % account.link_id) # self.location('/NS_AVEEC?ch4=%s' % account._link_id)
# return self.page.get_operations() # return self.page.get_operations()

4
modules/creditmutuel/pages.py
View file

@ -54,8 +54,8 @@ class AccountsPage(BasePage):
if first_td.attrib.get('class', '') == 'i g' or first_td.attrib.get('class', '') == 'p g': if first_td.attrib.get('class', '') == 'i g' or first_td.attrib.get('class', '') == 'p g':
account = Account() account = Account()
account.label = u"%s"%first_td.find('a').text.strip() account.label = u"%s"%first_td.find('a').text.strip()
account.link_id = first_td.find('a').get('href', '') account._link_id = first_td.find('a').get('href', '')
if account.link_id.startswith('POR_SyntheseLst'): if account._link_id.startswith('POR_SyntheseLst'):
continue continue
account.id = first_td.find('a').text.split(' ')[0]+first_td.find('a').text.split(' ')[1] account.id = first_td.find('a').text.split(' ')[0]+first_td.find('a').text.split(' ')[1]

2
modules/hsbc/backend.py
View file

@ -57,5 +57,5 @@ class HSBCBackend(BaseBackend, ICapBank):
def iter_history(self, account): def iter_history(self, account):
with self.browser: with self.browser:
for history in self.browser.get_history(account.link_id): for history in self.browser.get_history(account._link_id):
yield history yield history

4
modules/hsbc/pages/accounts.py
View file

@ -41,9 +41,9 @@ class AccountsListPage(BasePage):
a = tds[0].findall('a')[-1] a = tds[0].findall('a')[-1]
account.label = a.text.strip() account.label = a.text.strip()
account.link_id = a.attrib['href'] account._link_id = a.attrib['href']
if not 'CPT_IdPrestation' in account.link_id: if not 'CPT_IdPrestation' in account._link_id:
continue continue
tag = tds[2].find('font') tag = tds[2].find('font')

4
modules/lcl/browser.py
View file

@ -84,10 +84,10 @@ class LCLBrowser(BaseBrowser):
def get_history(self,account): def get_history(self,account):
if not self.is_on_page(AccountHistoryPage) : if not self.is_on_page(AccountHistoryPage) :
self.location('%s://%s%s' % (self.PROTOCOL, self.DOMAIN, account.link_id)) self.location('%s://%s%s' % (self.PROTOCOL, self.DOMAIN, account._link_id))
return self.page.get_operations(account) return self.page.get_operations(account)
#def get_coming_operations(self, account): #def get_coming_operations(self, account):
# if not self.is_on_page(AccountComing) or self.page.account.id != account.id: # if not self.is_on_page(AccountComing) or self.page.account.id != account.id:
# self.location('/NS_AVEEC?ch4=%s' % account.link_id) # self.location('/NS_AVEEC?ch4=%s' % account._link_id)
# return self.page.get_operations() # return self.page.get_operations()

2
modules/lcl/pages.py
View file

@ -127,7 +127,7 @@ class AccountsPage(BasePage):
link=a.attrib.get('href') link=a.attrib.get('href')
if link is not None and link.startswith("/outil/UWLM/ListeMouvements"): if link is not None and link.startswith("/outil/UWLM/ListeMouvements"):
account = Account() account = Account()
account.link_id=link+"&mode=45" account._link_id=link+"&mode=45"
parameters=link.split("?").pop().split("&") parameters=link.split("?").pop().split("&")
for parameter in parameters: for parameter in parameters:
list=parameter.split("=") list=parameter.split("=")

2
modules/societegenerale/browser.py
View file

@ -83,7 +83,7 @@ class SocieteGenerale(BaseBrowser):
raise NotImplementedError() raise NotImplementedError()
#if not self.is_on_page(AccountHistory) or self.page.account.id != account.id: #if not self.is_on_page(AccountHistory) or self.page.account.id != account.id:
# self.location(account.link_id) # self.location(account._link_id)
#return self.page.get_operations() #return self.page.get_operations()
def transfer(self, from_id, to_id, amount, reason=None): def transfer(self, from_id, to_id, amount, reason=None):

2
modules/societegenerale/pages/accounts_list.py
View file

@ -38,7 +38,7 @@ class AccountsList(BasePage):
if td.attrib.get('headers', '') == 'TypeCompte': if td.attrib.get('headers', '') == 'TypeCompte':
a = td.find('a') a = td.find('a')
account.label = a.find("span").text account.label = a.find("span").text
account.link_id = a.get('href', '') account._link_id = a.get('href', '')
elif td.attrib.get('headers', '') == 'NumeroCompte': elif td.attrib.get('headers', '') == 'NumeroCompte':
id = td.text id = td.text