From 15e6e19e16629baf4643ef0561e3d8700a78d753 Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Fri, 6 Jan 2012 20:45:18 +0100 Subject: [PATCH] fix missing import and pyflakes errors --- weboob/backends/ing/browser.py | 6 ++--- weboob/backends/ing/pages/__init__.py | 3 +-- weboob/backends/ing/pages/account_history.py | 2 -- weboob/backends/ing/pages/login.py | 23 ++++++++++---------- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/weboob/backends/ing/browser.py b/weboob/backends/ing/browser.py index 72cab2ec..f13c46f5 100644 --- a/weboob/backends/ing/browser.py +++ b/weboob/backends/ing/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword +from weboob.tools.browser import BaseBrowser from weboob.backends.ing import pages @@ -31,7 +31,7 @@ class Ing(BaseBrowser): ENCODING = None # refer to the HTML encoding PAGES = {'.*displayTRAccountSummary.*': pages.AccountsList, '.*displayLogin.jsf': pages.LoginPage, - '.*displayLogin.jsf.*': pages.LoginPage2, + '.*displayLogin.jsf.*': pages.LoginPage2, '.*accountDetail.jsf.*': pages.AccountHistory } @@ -77,7 +77,7 @@ class Ing(BaseBrowser): return None - def get_history(self, id): + def get_history(self, id): # TODO: It works only with the Compte Courant, Livret A use an another page... self.location('https://secure.ingdirect.fr/protected/pages/cc/accountDetail.jsf') return self.page.get_operations() diff --git a/weboob/backends/ing/pages/__init__.py b/weboob/backends/ing/pages/__init__.py index bcc20aa5..2b77ddc2 100644 --- a/weboob/backends/ing/pages/__init__.py +++ b/weboob/backends/ing/pages/__init__.py @@ -19,11 +19,10 @@ from .accounts_list import AccountsList -from .account_coming import AccountComing from .account_history import AccountHistory from .login import LoginPage, LoginPage2, ConfirmPage, MessagePage class AccountPrelevement(AccountsList): pass -__all__ = ['AccountsList', 'AccountComing', 'AccountHistory', 'LoginPage', +__all__ = ['AccountsList', 'AccountHistory', 'LoginPage', 'LoginPage2', 'ConfirmPage', 'MessagePage', 'AccountPrelevement'] diff --git a/weboob/backends/ing/pages/account_history.py b/weboob/backends/ing/pages/account_history.py index d4135077..c4a9dea3 100644 --- a/weboob/backends/ing/pages/account_history.py +++ b/weboob/backends/ing/pages/account_history.py @@ -18,12 +18,10 @@ # along with weboob. If not, see . -import re from datetime import date from weboob.tools.browser import BasePage from weboob.capabilities.bank import Operation -from weboob.capabilities.base import NotAvailable __all__ = ['AccountHistory'] diff --git a/weboob/backends/ing/pages/login.py b/weboob/backends/ing/pages/login.py index 399d08bb..ac8a0ff0 100644 --- a/weboob/backends/ing/pages/login.py +++ b/weboob/backends/ing/pages/login.py @@ -20,10 +20,9 @@ import re from weboob.tools.mech import ClientForm -import urllib from logging import error -from weboob.tools.browser import BasePage, BrowserUnavailable +from weboob.tools.browser import BasePage from weboob.tools.captcha.virtkeyboard import VirtKeyboard,VirtKeyboardError import tempfile @@ -50,10 +49,10 @@ class INGVirtKeyboard(VirtKeyboard): return False url=img.attrib.get("src") coords={} - coords["11"] = (5, 5, 33, 33) + coords["11"] = (5, 5, 33, 33) coords["21"] = (45, 5, 73, 33) coords["31"] = (85, 5, 113, 33) - coords["41"] = (125, 5, 153, 33) + coords["41"] = (125, 5, 153, 33) coords["51"] = (165, 5, 193, 33) coords["12"] = (5, 45, 33, 73) coords["22"] = (45, 45, 73, 73) @@ -62,7 +61,7 @@ class INGVirtKeyboard(VirtKeyboard): coords["52"] = (165, 45, 193, 73) VirtKeyboard.__init__(self, basepage.browser.openurl(url), coords, self.color) - + if basepage.browser.responses_dirname is None: basepage.browser.responses_dirname = \ tempfile.mkdtemp(prefix='weboob_session_') @@ -78,7 +77,7 @@ class INGVirtKeyboard(VirtKeyboard): first = False codesymbol = self.get_symbol_code(self.symbols[c]) x = (self.coords[codesymbol][0] + self.coords[codesymbol][2]) / 2 # In the middle - y = (self.coords[codesymbol][1] + self.coords[codesymbol][3]) / 2 + y = (self.coords[codesymbol][1] + self.coords[codesymbol][3]) / 2 code+=str(x) code+="," code+=str(y) @@ -94,10 +93,10 @@ class LoginPage(BasePage): # First step : login and birthday self.browser.select_form('zone1Form') self.browser.set_all_readonly(False) - self.browser['zone1Form:numClient'] = login - self.browser['zone1Form:dateDay'] = birthday[0:2] - self.browser['zone1Form:dateMonth'] = birthday[2:4] - self.browser['zone1Form:dateYear'] = birthday[4:9] + self.browser['zone1Form:numClient'] = login + self.browser['zone1Form:dateDay'] = birthday[0:2] + self.browser['zone1Form:dateMonth'] = birthday[2:4] + self.browser['zone1Form:dateYear'] = birthday[4:9] self.browser['zone1Form:radioSaveClientNumber'] = False self.browser.submit(nologin=True) @@ -114,9 +113,9 @@ class LoginPage2(BasePage): return False realpasswd = "" span = self.document.find('//span[@id="digitpaddisplayLogin"]') - i = 0 + i = 0 for font in span.getiterator('font'): - if font.attrib.get('class') == "vide": + if font.attrib.get('class') == "vide": realpasswd += password[i] i+=1 self.browser.logger.debug('We are looking for : ' + realpasswd)