From e19a51e23c0f368b58ea2fc64292b4f8eb165273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= Date: Fri, 4 Nov 2011 10:14:09 +0100 Subject: [PATCH] BNPorc: make color a BNPVirtKeyboard property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and simplify BNPVirtKeyboard constructor arguments Signed-off-by: Pierre Mazière --- weboob/backends/bnporc/pages/login.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/weboob/backends/bnporc/pages/login.py b/weboob/backends/bnporc/pages/login.py index 9014d760..725ca4ec 100644 --- a/weboob/backends/bnporc/pages/login.py +++ b/weboob/backends/bnporc/pages/login.py @@ -43,13 +43,15 @@ class BNPVirtKeyboard(MappedVirtKeyboard): url="/NSImgGrille" - def __init__(self,browser,document,color): - img=document.find("//img[@usemap='#MapGril']") - MappedVirtKeyboard.__init__(self,browser.openurl(self.url),document,img,color) - if browser.responses_dirname is None: - browser.responses_dirname = \ + color=27 + + def __init__(self,basepage): + img=basepage.document.find("//img[@usemap='#MapGril']") + 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_') - self.check_symbols(self.symbols,browser.responses_dirname) + self.check_symbols(self.symbols,basepage.browser.responses_dirname) def get_symbol_code(self,md5sum): code=MappedVirtKeyboard.get_symbol_code(self,md5sum) @@ -74,7 +76,7 @@ class LoginPage(BasePage): def login(self, login, password): try: - vk=BNPVirtKeyboard(self.browser,self.document,27) + vk=BNPVirtKeyboard(self) except VirtKeyboardError,err: error("Error: %s"%err) return False @@ -96,7 +98,7 @@ class ConfirmPage(BasePage): class ChangePasswordPage(BasePage): def change_password(self, current, new): try: - vk=BNPVirtKeyboard(self.browser,self.document,27) + vk=BNPVirtKeyboard(self) except VirtKeyboardError,err: error("Error: %s"%err) return False