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

remove all of the agency parameter (refs #1313)

Browse source
This commit is contained in:
Romain Bignon 2013-12-16 12:35:29 +01:00
commit 3887bd70c4
3 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/lcl/backend.py
View file

@ -53,8 +53,7 @@ class LCLBackend(BaseBackend, ICapBank):
self.config['password'].get()) self.config['password'].get())
else: else:
self.BROWSER = LCLBrowser self.BROWSER = LCLBrowser
return self.create_browser(self.config['agency'].get(), return self.create_browser(self.config['login'].get(),
self.config['login'].get(),
self.config['password'].get()) self.config['password'].get())
def deinit(self): def deinit(self):

6
modules/lcl/browser.py
View file

@ -52,10 +52,6 @@ class LCLBrowser(BaseBrowser):
'https://particuliers.secure.lcl.fr/index.html': SkipPage 'https://particuliers.secure.lcl.fr/index.html': SkipPage
} }
def __init__(self, agency, *args, **kwargs):
self.agency = agency
BaseBrowser.__init__(self, *args, **kwargs)
def is_logged(self): def is_logged(self):
return not self.is_on_page(LoginPage) return not self.is_on_page(LoginPage)
@ -69,7 +65,7 @@ class LCLBrowser(BaseBrowser):
% (self.PROTOCOL, self.DOMAIN), % (self.PROTOCOL, self.DOMAIN),
no_login=True) no_login=True)
if not self.page.login(self.username, self.password, self.agency) or \ if not self.page.login(self.username, self.password) or \
(self.is_on_page(LoginPage) and self.page.is_error()) : (self.is_on_page(LoginPage) and self.page.is_error()) :
raise BrowserIncorrectPassword("invalid login/password.\nIf you did not change anything, be sure to check for password renewal request\non the original web site.\nAutomatic renewal will be implemented later.") raise BrowserIncorrectPassword("invalid login/password.\nIf you did not change anything, be sure to check for password renewal request\non the original web site.\nAutomatic renewal will be implemented later.")
self.location('%s://%s/outil/UWSP/Synthese' self.location('%s://%s/outil/UWSP/Synthese'

8
modules/lcl/pages.py
View file

@ -89,7 +89,7 @@ class LoginPage(BasePage):
s+=chr(seed^ord(value[i])) s+=chr(seed^ord(value[i]))
return s return s
def login(self, login, passwd, agency): def login(self, login, passwd):
try: try:
vk=LCLVirtKeyboard(self) vk=LCLVirtKeyboard(self)
except VirtKeyboardError as err: except VirtKeyboardError as err:
@ -114,11 +114,7 @@ class LoginPage(BasePage):
self.browser.select_form( self.browser.select_form(
predicate=lambda x: x.attrs.get('id','')=='formAuthenticate') predicate=lambda x: x.attrs.get('id','')=='formAuthenticate')
self.browser.form.set_all_readonly(False) self.browser.form.set_all_readonly(False)
if len(agency) > 0: self.browser['identifiant'] = login.encode('utf-8')
self.browser['agenceId'] = agency.encode('utf-8')
self.browser['compteId'] = login.encode('utf-8')
else:
self.browser['identifiant'] = login.encode('utf-8')
self.browser['postClavierXor'] = base64.b64encode(self.myXOR(password,seed)) self.browser['postClavierXor'] = base64.b64encode(self.myXOR(password,seed))
try: try:
self.browser.submit(nologin=True) self.browser.submit(nologin=True)