fix missing import and pyflakes errors

This commit is contained in:
Romain Bignon 2012-01-06 20:45:18 +01:00
commit 15e6e19e16
4 changed files with 15 additions and 19 deletions

View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword from weboob.tools.browser import BaseBrowser
from weboob.backends.ing import pages from weboob.backends.ing import pages
@ -31,7 +31,7 @@ class Ing(BaseBrowser):
ENCODING = None # refer to the HTML encoding ENCODING = None # refer to the HTML encoding
PAGES = {'.*displayTRAccountSummary.*': pages.AccountsList, PAGES = {'.*displayTRAccountSummary.*': pages.AccountsList,
'.*displayLogin.jsf': pages.LoginPage, '.*displayLogin.jsf': pages.LoginPage,
'.*displayLogin.jsf.*': pages.LoginPage2, '.*displayLogin.jsf.*': pages.LoginPage2,
'.*accountDetail.jsf.*': pages.AccountHistory '.*accountDetail.jsf.*': pages.AccountHistory
} }
@ -77,7 +77,7 @@ class Ing(BaseBrowser):
return None 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... # 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') self.location('https://secure.ingdirect.fr/protected/pages/cc/accountDetail.jsf')
return self.page.get_operations() return self.page.get_operations()

View file

@ -19,11 +19,10 @@
from .accounts_list import AccountsList from .accounts_list import AccountsList
from .account_coming import AccountComing
from .account_history import AccountHistory from .account_history import AccountHistory
from .login import LoginPage, LoginPage2, ConfirmPage, MessagePage from .login import LoginPage, LoginPage2, ConfirmPage, MessagePage
class AccountPrelevement(AccountsList): pass class AccountPrelevement(AccountsList): pass
__all__ = ['AccountsList', 'AccountComing', 'AccountHistory', 'LoginPage', __all__ = ['AccountsList', 'AccountHistory', 'LoginPage', 'LoginPage2',
'ConfirmPage', 'MessagePage', 'AccountPrelevement'] 'ConfirmPage', 'MessagePage', 'AccountPrelevement']

View file

@ -18,12 +18,10 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>. # along with weboob. If not, see <http://www.gnu.org/licenses/>.
import re
from datetime import date from datetime import date
from weboob.tools.browser import BasePage from weboob.tools.browser import BasePage
from weboob.capabilities.bank import Operation from weboob.capabilities.bank import Operation
from weboob.capabilities.base import NotAvailable
__all__ = ['AccountHistory'] __all__ = ['AccountHistory']

View file

@ -20,10 +20,9 @@
import re import re
from weboob.tools.mech import ClientForm from weboob.tools.mech import ClientForm
import urllib
from logging import error 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 from weboob.tools.captcha.virtkeyboard import VirtKeyboard,VirtKeyboardError
import tempfile import tempfile
@ -50,10 +49,10 @@ class INGVirtKeyboard(VirtKeyboard):
return False return False
url=img.attrib.get("src") url=img.attrib.get("src")
coords={} coords={}
coords["11"] = (5, 5, 33, 33) coords["11"] = (5, 5, 33, 33)
coords["21"] = (45, 5, 73, 33) coords["21"] = (45, 5, 73, 33)
coords["31"] = (85, 5, 113, 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["51"] = (165, 5, 193, 33)
coords["12"] = (5, 45, 33, 73) coords["12"] = (5, 45, 33, 73)
coords["22"] = (45, 45, 73, 73) coords["22"] = (45, 45, 73, 73)
@ -62,7 +61,7 @@ class INGVirtKeyboard(VirtKeyboard):
coords["52"] = (165, 45, 193, 73) coords["52"] = (165, 45, 193, 73)
VirtKeyboard.__init__(self, basepage.browser.openurl(url), coords, self.color) VirtKeyboard.__init__(self, basepage.browser.openurl(url), coords, self.color)
if basepage.browser.responses_dirname is None: if basepage.browser.responses_dirname is None:
basepage.browser.responses_dirname = \ basepage.browser.responses_dirname = \
tempfile.mkdtemp(prefix='weboob_session_') tempfile.mkdtemp(prefix='weboob_session_')
@ -78,7 +77,7 @@ class INGVirtKeyboard(VirtKeyboard):
first = False first = False
codesymbol = self.get_symbol_code(self.symbols[c]) codesymbol = self.get_symbol_code(self.symbols[c])
x = (self.coords[codesymbol][0] + self.coords[codesymbol][2]) / 2 # In the middle 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+=str(x)
code+="," code+=","
code+=str(y) code+=str(y)
@ -94,10 +93,10 @@ class LoginPage(BasePage):
# First step : login and birthday # First step : login and birthday
self.browser.select_form('zone1Form') self.browser.select_form('zone1Form')
self.browser.set_all_readonly(False) self.browser.set_all_readonly(False)
self.browser['zone1Form:numClient'] = login self.browser['zone1Form:numClient'] = login
self.browser['zone1Form:dateDay'] = birthday[0:2] self.browser['zone1Form:dateDay'] = birthday[0:2]
self.browser['zone1Form:dateMonth'] = birthday[2:4] self.browser['zone1Form:dateMonth'] = birthday[2:4]
self.browser['zone1Form:dateYear'] = birthday[4:9] self.browser['zone1Form:dateYear'] = birthday[4:9]
self.browser['zone1Form:radioSaveClientNumber'] = False self.browser['zone1Form:radioSaveClientNumber'] = False
self.browser.submit(nologin=True) self.browser.submit(nologin=True)
@ -114,9 +113,9 @@ class LoginPage2(BasePage):
return False return False
realpasswd = "" realpasswd = ""
span = self.document.find('//span[@id="digitpaddisplayLogin"]') span = self.document.find('//span[@id="digitpaddisplayLogin"]')
i = 0 i = 0
for font in span.getiterator('font'): for font in span.getiterator('font'):
if font.attrib.get('class') == "vide": if font.attrib.get('class') == "vide":
realpasswd += password[i] realpasswd += password[i]
i+=1 i+=1
self.browser.logger.debug('We are looking for : ' + realpasswd) self.browser.logger.debug('We are looking for : ' + realpasswd)