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

when website is unavailable, raise BrowserUnavailable() instead of BrowserIncorrectPassword()

Browse source
This commit is contained in:
Romain Bignon 2010-10-31 09:16:46 +01:00
commit 08605f7901
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
weboob/backends/bnporc/browser.py
View file

@ -41,8 +41,6 @@ class BNPorc(BaseBrowser):
'.*SAF_CHM_VALID.*': pages.ConfirmPage,
}
is_logging = False
def __init__(self, *args, **kwargs):
self.rotating_password = kwargs.pop('rotating_password', None)
self.password_changed_cb = kwargs.pop('password_changed_cb', None)
@ -52,7 +50,7 @@ class BNPorc(BaseBrowser):
self.location('https://www.secure.bnpparibas.net/banque/portail/particulier/HomeConnexion?type=homeconnex')
def is_logged(self):
return not self.is_on_page(pages.LoginPage) or self.is_logging
return not self.is_on_page(pages.LoginPage)
def login(self):
assert isinstance(self.username, basestring)
@ -62,13 +60,11 @@ class BNPorc(BaseBrowser):
if not self.is_on_page(pages.LoginPage):
self.location('https://www.secure.bnpparibas.net/banque/portail/particulier/HomeConnexion?type=homeconnex')
self.is_logging = True
self.page.login(self.username, self.password)
self.location('/NSFR?Action=DSP_VGLOBALE')
self.location('/NSFR?Action=DSP_VGLOBALE', no_login=True)
if self.is_on_page(pages.LoginPage):
raise BrowserIncorrectPassword()
self.is_logging = False
def change_password(self, new_password):
assert new_password.isdigit() and len(new_password) == 6

9
weboob/backends/bnporc/pages/login.py
View file

@ -20,7 +20,7 @@ from weboob.tools.mech import ClientForm
import urllib
from logging import error
from weboob.tools.browser import BasePage
from weboob.tools.browser import BasePage, BrowserUnavailable
from weboob.backends.bnporc.captcha import Captcha, TileError
@ -29,7 +29,12 @@ __all__ = ['LoginPage', 'ConfirmPage', 'ChangePasswordPage']
class LoginPage(BasePage):
def on_loaded(self):
pass
for td in self.document.getroot().cssselect('td.LibelleErreur'):
if td.text is None:
continue
msg = td.text.strip()
if 'indisponible' in msg:
raise BrowserUnavailable(msg)
def login(self, login, password):
img = Captcha(self.browser.openurl('/NSImgGrille'))