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

BNPorc: make color a BNPVirtKeyboard property

Browse source 
and simplify BNPVirtKeyboard constructor arguments

Signed-off-by: Pierre Mazière <pierre.maziere@gmail.com>
This commit is contained in:
Pierre Mazière 2011-11-04 10:14:09 +01:00
commit e19a51e23c
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,13 +43,15 @@ class BNPVirtKeyboard(MappedVirtKeyboard):
url="/NSImgGrille" url="/NSImgGrille"
def __init__(self,browser,document,color): color=27
img=document.find("//img[@usemap='#MapGril']")
MappedVirtKeyboard.__init__(self,browser.openurl(self.url),document,img,color) def __init__(self,basepage):
if browser.responses_dirname is None: img=basepage.document.find("//img[@usemap='#MapGril']")
browser.responses_dirname = \ MappedVirtKeyboard.__init__(self,basepage.browser.openurl(self.url),basepage.document,img,self.color)
if basepage.browser.responses_dirname is None:
basepage.browser.responses_dirname = \
tempfile.mkdtemp(prefix='weboob_session_') tempfile.mkdtemp(prefix='weboob_session_')
self.check_symbols(self.symbols,browser.responses_dirname) self.check_symbols(self.symbols,basepage.browser.responses_dirname)
def get_symbol_code(self,md5sum): def get_symbol_code(self,md5sum):
code=MappedVirtKeyboard.get_symbol_code(self,md5sum) code=MappedVirtKeyboard.get_symbol_code(self,md5sum)
@ -74,7 +76,7 @@ class LoginPage(BasePage):
def login(self, login, password): def login(self, login, password):
try: try:
vk=BNPVirtKeyboard(self.browser,self.document,27) vk=BNPVirtKeyboard(self)
except VirtKeyboardError,err: except VirtKeyboardError,err:
error("Error: %s"%err) error("Error: %s"%err)
return False return False
@ -96,7 +98,7 @@ class ConfirmPage(BasePage):
class ChangePasswordPage(BasePage): class ChangePasswordPage(BasePage):
def change_password(self, current, new): def change_password(self, current, new):
try: try:
vk=BNPVirtKeyboard(self.browser,self.document,27) vk=BNPVirtKeyboard(self)
except VirtKeyboardError,err: except VirtKeyboardError,err:
error("Error: %s"%err) error("Error: %s"%err)
return False return False