From a9020483c250c25d361f84d78b211d4fb054bdc4 Mon Sep 17 00:00:00 2001 From: Florent Date: Thu, 20 Mar 2014 15:11:14 +0100 Subject: [PATCH] Cleaning after browser2 --- modules/poivy/browser.py | 3 ++- modules/poivy/pages.py | 9 +-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/poivy/browser.py b/modules/poivy/browser.py index 339a5534..9c2502e0 100644 --- a/modules/poivy/browser.py +++ b/modules/poivy/browser.py @@ -19,6 +19,7 @@ from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.tools.browser import BrowserBanned, BrowserIncorrectPassword from .pages import HomePage, LoginPage, HistoryPage, BillsPage, ErrorPage __all__ = ['PoivyBrowser'] @@ -68,5 +69,5 @@ class PoivyBrowser(LoginBrowser): return self.bills.stay_or_go().get_bills() @need_login - def get_bill(self, id): + def get_bill(self, _id): return self._find_id_list(self.iter_bills(), _id) diff --git a/modules/poivy/pages.py b/modules/poivy/pages.py index 21d0b916..55f0f3a5 100644 --- a/modules/poivy/pages.py +++ b/modules/poivy/pages.py @@ -20,10 +20,8 @@ from weboob.tools.browser2.page import HTMLPage, LoggedPage, method, ListElement, ItemElement from weboob.tools.browser2.filters import Env, CleanText, CleanDecimal, Field, Attr, Filter, Time, Date from weboob.capabilities.bill import Subscription, Detail -from decimal import Decimal, InvalidOperation -from datetime import datetime, date, time +from datetime import datetime -import re __all__ = ['LoginPage', 'HomePage', 'HistoryPage', 'BillsPage', 'ErrorPage'] @@ -33,11 +31,6 @@ class ErrorPage(HTMLPage): class LoginPage(HTMLPage): - def _predicate_form(self, form): - try: - return form.attrs['class'] == "form-detail" - except: - return False def login(self, login, password): captcha = self.doc.xpath('//label[@class="label_captcha_input"]')