From 7e0685afe96c42126d4d7e0ef968b2c7be7fc52c Mon Sep 17 00:00:00 2001 From: Vincent Ardisson Date: Sun, 5 Nov 2017 16:45:32 +0100 Subject: [PATCH] modules: import TableCell from filters.html instead of filters.standard --- modules/axabanque/pages/bank.py | 4 ++-- modules/axabanque/pages/wealth.py | 4 ++-- modules/barclays/pages.py | 4 ++-- modules/bforbank/pages.py | 4 ++-- modules/boursorama/pages.py | 4 ++-- modules/bp/pages/accounthistory.py | 4 ++-- modules/bp/pages/mandate.py | 4 ++-- modules/caissedepargne/pages.py | 4 ++-- modules/carrefourbanque/pages.py | 4 ++-- modules/cci/pages.py | 5 ++--- modules/cmes/pages.py | 4 ++-- modules/cmso/par/pages.py | 4 ++-- modules/cmso/pro/pages.py | 4 ++-- modules/cragr/web/pages.py | 6 ++---- modules/creditdunordpee/pages.py | 4 ++-- modules/creditmutuel/pages.py | 8 +++----- modules/groupamaes/pages.py | 3 ++- modules/hsbc/pages/account_pages.py | 4 ++-- modules/hsbc/pages/life_insurances.py | 4 ++-- modules/ing/pages/accounts_list.py | 5 ++--- modules/ing/pages/titre.py | 4 ++-- modules/lcl/enterprise/pages.py | 4 ++-- modules/lcl/pages.py | 4 ++-- modules/linebourse/pages.py | 3 ++- modules/lolix/pages.py | 4 ++-- modules/materielnet/pages.py | 4 ++-- modules/onlinenet/pages.py | 4 ++-- modules/orange/bill/pages/bills.py | 4 ++-- modules/s2e/pages.py | 4 ++-- modules/spirica/pages.py | 4 ++-- modules/transilien/pages.py | 4 ++-- modules/vlille/pages.py | 3 ++- 32 files changed, 65 insertions(+), 68 deletions(-) diff --git a/modules/axabanque/pages/bank.py b/modules/axabanque/pages/bank.py index d24b126060..0d9f66d643 100644 --- a/modules/axabanque/pages/bank.py +++ b/modules/axabanque/pages/bank.py @@ -24,8 +24,8 @@ from weboob.exceptions import BrowserUnavailable from weboob.browser.pages import HTMLPage, PDFPage, LoggedPage, AbstractPage from weboob.browser.elements import ItemElement, TableElement, method -from weboob.browser.filters.standard import CleanText, CleanDecimal, TableCell, Date, Regexp, Field, Env, Currency -from weboob.browser.filters.html import Attr, Link +from weboob.browser.filters.standard import CleanText, CleanDecimal, Date, Regexp, Field, Env, Currency +from weboob.browser.filters.html import Attr, Link, TableCell from weboob.capabilities.bank import Account, Investment from weboob.capabilities.base import NotAvailable from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/modules/axabanque/pages/wealth.py b/modules/axabanque/pages/wealth.py index 3c758a8285..f326a40e5d 100644 --- a/modules/axabanque/pages/wealth.py +++ b/modules/axabanque/pages/wealth.py @@ -24,9 +24,9 @@ from weboob.browser.elements import ListElement, ItemElement, method, TableElement from weboob.browser.filters.standard import ( CleanText, Date, Regexp, CleanDecimal, Eval, Field, Async, AsyncLoad, - TableCell, QueryValue, Currency + QueryValue, Currency, ) -from weboob.browser.filters.html import Attr, Link +from weboob.browser.filters.html import Attr, Link, TableCell from weboob.capabilities.bank import Account, Investment from weboob.capabilities.base import NotAvailable, NotLoaded from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/modules/barclays/pages.py b/modules/barclays/pages.py index c2d0e2e4b1..4ee312ef1f 100644 --- a/modules/barclays/pages.py +++ b/modules/barclays/pages.py @@ -25,8 +25,8 @@ from weboob.browser.pages import HTMLPage, PDFPage, LoggedPage from weboob.browser.elements import TableElement, ListElement, ItemElement, method -from weboob.browser.filters.standard import CleanText, CleanDecimal, Regexp, Field, TableCell, Date, Eval -from weboob.browser.filters.html import Attr +from weboob.browser.filters.standard import CleanText, CleanDecimal, Regexp, Field, Date, Eval +from weboob.browser.filters.html import Attr, TableCell from weboob.capabilities.bank import Account, Investment, NotAvailable from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.capabilities.bank.iban import is_iban_valid diff --git a/modules/bforbank/pages.py b/modules/bforbank/pages.py index 9221841211..7278818a5a 100644 --- a/modules/bforbank/pages.py +++ b/modules/bforbank/pages.py @@ -29,9 +29,9 @@ from weboob.browser.pages import LoggedPage, HTMLPage, pagination, AbstractPage from weboob.browser.elements import method, ListElement, ItemElement, TableElement from weboob.capabilities.bank import Account -from weboob.browser.filters.html import Link, Attr +from weboob.browser.filters.html import Link, Attr, TableCell from weboob.browser.filters.standard import ( - CleanText, Regexp, Field, Map, CleanDecimal, Date, TableCell, + CleanText, Regexp, Field, Map, CleanDecimal, Date, ) from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.compat import urlencode, urlparse, urlunparse, parse_qsl, urljoin diff --git a/modules/boursorama/pages.py b/modules/boursorama/pages.py index a863c023ec..b0d0378d88 100644 --- a/modules/boursorama/pages.py +++ b/modules/boursorama/pages.py @@ -29,11 +29,11 @@ from weboob.browser.pages import HTMLPage, LoggedPage, pagination, NextPage, FormNotFound, PartialHTMLPage from weboob.browser.elements import ListElement, ItemElement, method, TableElement, SkipItem from weboob.browser.filters.standard import ( - CleanText, CleanDecimal, Field, Format, TableCell, + CleanText, CleanDecimal, Field, Format, Regexp, Date, AsyncLoad, Async, Eval, RegexpError, Env, Currency as CleanCurrency, ) -from weboob.browser.filters.html import Attr, Link +from weboob.browser.filters.html import Attr, Link, TableCell from weboob.capabilities.bank import Account, Investment, Recipient, Transfer, AccountNotFound, AddRecipientError from weboob.capabilities.base import NotAvailable, empty from weboob.capabilities.profile import Person diff --git a/modules/bp/pages/accounthistory.py b/modules/bp/pages/accounthistory.py index 4de0ce7b58..c144332215 100644 --- a/modules/bp/pages/accounthistory.py +++ b/modules/bp/pages/accounthistory.py @@ -27,8 +27,8 @@ from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.browser.pages import LoggedPage from weboob.browser.elements import TableElement, ItemElement, method -from weboob.browser.filters.html import Link -from weboob.browser.filters.standard import CleanDecimal, CleanText, Eval, TableCell, Field, Async, AsyncLoad, Date, Env +from weboob.browser.filters.html import Link, TableCell +from weboob.browser.filters.standard import CleanDecimal, CleanText, Eval, Field, Async, AsyncLoad, Date, Env from weboob.tools.compat import urljoin from .base import MyHTMLPage diff --git a/modules/bp/pages/mandate.py b/modules/bp/pages/mandate.py index 3b337042b6..f445f6c4f9 100644 --- a/modules/bp/pages/mandate.py +++ b/modules/bp/pages/mandate.py @@ -22,9 +22,9 @@ from weboob.browser.pages import LoggedPage, HTMLPage, pagination from weboob.browser.elements import TableElement, ItemElement, method -from weboob.browser.filters.html import Link, Attr +from weboob.browser.filters.html import Link, Attr, TableCell from weboob.browser.filters.standard import CleanText, CleanDecimal, Regexp, \ - Format, Currency, TableCell + Format, Currency from weboob.capabilities.base import NotAvailable from weboob.capabilities.bank import Account, Investment diff --git a/modules/caissedepargne/pages.py b/modules/caissedepargne/pages.py index 0a0118f885..3914d4474e 100644 --- a/modules/caissedepargne/pages.py +++ b/modules/caissedepargne/pages.py @@ -29,8 +29,8 @@ from weboob.browser.pages import LoggedPage, HTMLPage, JsonPage, pagination from weboob.browser.elements import ItemElement, method, ListElement, TableElement, SkipItem -from weboob.browser.filters.standard import Date, CleanDecimal, Regexp, CleanText, Env, Upper, TableCell, Field -from weboob.browser.filters.html import Link, Attr +from weboob.browser.filters.standard import Date, CleanDecimal, Regexp, CleanText, Env, Upper, Field +from weboob.browser.filters.html import Link, Attr, TableCell from weboob.capabilities import NotAvailable from weboob.capabilities.bank import Account, Investment, Recipient, TransferError, TransferBankError, Transfer,\ AddRecipientError diff --git a/modules/carrefourbanque/pages.py b/modules/carrefourbanque/pages.py index 3792068eed..5c7bb7286c 100644 --- a/modules/carrefourbanque/pages.py +++ b/modules/carrefourbanque/pages.py @@ -24,9 +24,9 @@ from weboob.browser.pages import HTMLPage, LoggedPage, pagination from weboob.browser.elements import ListElement, TableElement, ItemElement, method from weboob.browser.filters.standard import ( - Regexp, Field, TableCell, CleanText, CleanDecimal, Eval, Currency + Regexp, Field, CleanText, CleanDecimal, Eval, Currency ) -from weboob.browser.filters.html import Link +from weboob.browser.filters.html import Link, TableCell from weboob.capabilities.bank import Account, Investment from weboob.capabilities.base import NotAvailable from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/modules/cci/pages.py b/modules/cci/pages.py index e9d2e24200..d5fe31ccba 100644 --- a/modules/cci/pages.py +++ b/modules/cci/pages.py @@ -19,9 +19,8 @@ from weboob.browser.pages import HTMLPage from weboob.browser.elements import ItemElement, TableElement, method -from weboob.browser.filters.standard import Filter, CleanText, Format, Env, DateTime, TableCell, Join -from weboob.browser.filters.html import Link, CleanHTML - +from weboob.browser.filters.standard import Filter, CleanText, Format, Env, DateTime, Join +from weboob.browser.filters.html import Link, CleanHTML, TableCell from weboob.capabilities.job import BaseJobAdvert diff --git a/modules/cmes/pages.py b/modules/cmes/pages.py index 948dfb5237..9d047734b8 100644 --- a/modules/cmes/pages.py +++ b/modules/cmes/pages.py @@ -23,8 +23,8 @@ from weboob.browser.pages import HTMLPage, LoggedPage, pagination from weboob.browser.elements import ListElement, ItemElement, method, TableElement from weboob.browser.filters.standard import CleanText, Upper, Date, Regexp, Field, \ - CleanDecimal, Env, TableCell, Async, AsyncLoad -from weboob.browser.filters.html import Link + CleanDecimal, Env, Async, AsyncLoad +from weboob.browser.filters.html import Link, TableCell from weboob.capabilities.bank import Account, Investment from weboob.capabilities.base import NotAvailable from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/modules/cmso/par/pages.py b/modules/cmso/par/pages.py index 76b384849a..f72b442374 100644 --- a/modules/cmso/par/pages.py +++ b/modules/cmso/par/pages.py @@ -24,9 +24,9 @@ from weboob.browser.pages import HTMLPage, JsonPage, RawPage, LoggedPage, pagination from weboob.browser.elements import DictElement, ItemElement, TableElement, SkipItem, method -from weboob.browser.filters.standard import CleanText, Upper, Date, Regexp, Format, CleanDecimal, Filter, Env, Slugify, TableCell, Field +from weboob.browser.filters.standard import CleanText, Upper, Date, Regexp, Format, CleanDecimal, Filter, Env, Slugify, Field from weboob.browser.filters.json import Dict -from weboob.browser.filters.html import Attr, Link +from weboob.browser.filters.html import Attr, Link, TableCell from weboob.browser.exceptions import ServerError from weboob.capabilities.bank import Account, Investment, Loan from weboob.capabilities.contact import Advisor diff --git a/modules/cmso/pro/pages.py b/modules/cmso/pro/pages.py index f28fd4258e..42265b3cb1 100644 --- a/modules/cmso/pro/pages.py +++ b/modules/cmso/pro/pages.py @@ -24,8 +24,8 @@ from weboob.exceptions import BrowserIncorrectPassword from weboob.browser.pages import HTMLPage, pagination from weboob.browser.elements import ListElement, ItemElement, TableElement, method -from weboob.browser.filters.standard import CleanText, CleanDecimal, DateGuesser, Env, Field, Filter, Regexp, TableCell -from weboob.browser.filters.html import Link, Attr +from weboob.browser.filters.standard import CleanText, CleanDecimal, DateGuesser, Env, Field, Filter, Regexp +from weboob.browser.filters.html import Link, Attr, TableCell from weboob.capabilities.bank import Account, Investment from weboob.capabilities.base import NotAvailable from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/modules/cragr/web/pages.py b/modules/cragr/web/pages.py index 30884294c9..ed723b560d 100644 --- a/modules/cragr/web/pages.py +++ b/modules/cragr/web/pages.py @@ -38,10 +38,8 @@ from weboob.tools.compat import urlparse, urljoin, unicode from weboob.browser.elements import TableElement, ItemElement, method from weboob.browser.filters.standard import Date, CleanText, CleanDecimal, Currency as CleanCurrency, \ - Regexp, Format, TableCell, Field - - -from weboob.browser.filters.html import Link + Regexp, Format, Field +from weboob.browser.filters.html import Link, TableCell def MyDecimal(*args, **kwargs): diff --git a/modules/creditdunordpee/pages.py b/modules/creditdunordpee/pages.py index b6b7503183..f24e3ac42e 100644 --- a/modules/creditdunordpee/pages.py +++ b/modules/creditdunordpee/pages.py @@ -25,8 +25,8 @@ from weboob.browser.pages import HTMLPage, LoggedPage from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard from weboob.browser.elements import ItemElement, TableElement, method -from weboob.browser.filters.standard import CleanText, CleanDecimal, Format, Regexp, Date, Env, TableCell, Currency, Eval -from weboob.browser.filters.html import CleanHTML +from weboob.browser.filters.standard import CleanText, CleanDecimal, Format, Regexp, Date, Env, Currency, Eval +from weboob.browser.filters.html import CleanHTML, TableCell from weboob.capabilities.bank import Account, Transaction, Investment from weboob.capabilities.base import NotAvailable from weboob.exceptions import NoAccountsException diff --git a/modules/creditmutuel/pages.py b/modules/creditmutuel/pages.py index 353171e26b..637fac6133 100644 --- a/modules/creditmutuel/pages.py +++ b/modules/creditmutuel/pages.py @@ -17,11 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . - import re import hashlib - from decimal import Decimal, InvalidOperation from dateutil.relativedelta import relativedelta from datetime import date, datetime @@ -30,9 +28,9 @@ from weboob.browser.pages import HTMLPage, FormNotFound, LoggedPage, pagination from weboob.browser.elements import ListElement, ItemElement, SkipItem, method, TableElement -from weboob.browser.filters.standard import Filter, Env, CleanText, CleanDecimal, Field, TableCell, \ - Regexp, Async, AsyncLoad, Date, ColumnNotFound, Format, Type -from weboob.browser.filters.html import Link, Attr +from weboob.browser.filters.standard import Filter, Env, CleanText, CleanDecimal, Field, \ + Regexp, Async, AsyncLoad, Date, Format, Type +from weboob.browser.filters.html import Link, Attr, TableCell, ColumnNotFound from weboob.exceptions import BrowserIncorrectPassword, ParseError, NoAccountsException, ActionNeeded from weboob.capabilities import NotAvailable from weboob.capabilities.base import empty diff --git a/modules/groupamaes/pages.py b/modules/groupamaes/pages.py index 6718b2684e..f3da8c5e31 100644 --- a/modules/groupamaes/pages.py +++ b/modules/groupamaes/pages.py @@ -23,7 +23,8 @@ from weboob.browser.pages import HTMLPage, LoggedPage from weboob.browser.elements import TableElement, ItemElement, method -from weboob.browser.filters.standard import CleanText, CleanDecimal, TableCell, Date, Env, Regexp, Field +from weboob.browser.filters.standard import CleanText, CleanDecimal, Date, Env, Regexp, Field +from weboob.browser.filters.html import TableCell from weboob.capabilities.bank import Account, Transaction, Investment, Pocket from weboob.capabilities.base import NotAvailable diff --git a/modules/hsbc/pages/account_pages.py b/modules/hsbc/pages/account_pages.py index 856da2ca8b..2d8a1a6ce7 100644 --- a/modules/hsbc/pages/account_pages.py +++ b/modules/hsbc/pages/account_pages.py @@ -29,9 +29,9 @@ from weboob.browser.elements import ListElement, ItemElement, method from weboob.browser.pages import HTMLPage, pagination from weboob.browser.filters.standard import ( - Filter, Env, CleanText, CleanDecimal, Field, DateGuesser, TableCell, Regexp + Filter, Env, CleanText, CleanDecimal, Field, DateGuesser, Regexp ) -from weboob.browser.filters.html import Link, AbsoluteLink +from weboob.browser.filters.html import Link, AbsoluteLink, TableCell from weboob.browser.filters.javascript import JSVar from .landing_pages import GenericLandingPage diff --git a/modules/hsbc/pages/life_insurances.py b/modules/hsbc/pages/life_insurances.py index fe328e2006..d624cdb221 100644 --- a/modules/hsbc/pages/life_insurances.py +++ b/modules/hsbc/pages/life_insurances.py @@ -11,9 +11,9 @@ from weboob.browser.elements import TableElement, ItemElement, method from weboob.browser.pages import HTMLPage, LoggedPage, FormNotFound from weboob.browser.filters.standard import ( - CleanText, CleanDecimal, Field, TableCell, Regexp, Eval, Date + CleanText, CleanDecimal, Field, Regexp, Eval, Date ) -from weboob.browser.filters.html import Link, XPathNotFound +from weboob.browser.filters.html import Link, XPathNotFound, TableCell from weboob.browser.filters.javascript import JSVar from .account_pages import Transaction diff --git a/modules/ing/pages/accounts_list.py b/modules/ing/pages/accounts_list.py index 1d60b027db..f142e22089 100644 --- a/modules/ing/pages/accounts_list.py +++ b/modules/ing/pages/accounts_list.py @@ -29,10 +29,9 @@ from weboob.browser.elements import ListElement, TableElement, ItemElement, method, DataError from weboob.browser.filters.standard import ( CleanText, CleanDecimal, Filter, Field, MultiFilter, Date, - Lower, Async, AsyncLoad, Format, TableCell, Env, - Regexp, + Lower, Async, AsyncLoad, Format, Env, Regexp, ) -from weboob.browser.filters.html import Attr, Link +from weboob.browser.filters.html import Attr, Link, TableCell from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/modules/ing/pages/titre.py b/modules/ing/pages/titre.py index 6ca760bab9..a09b416578 100644 --- a/modules/ing/pages/titre.py +++ b/modules/ing/pages/titre.py @@ -26,8 +26,8 @@ from weboob.capabilities.bank import Investment from weboob.browser.pages import RawPage, HTMLPage, LoggedPage, pagination from weboob.browser.elements import ListElement, TableElement, ItemElement, method -from weboob.browser.filters.standard import CleanDecimal, CleanText, Date, TableCell, Regexp, Env, Async, AsyncLoad -from weboob.browser.filters.html import Link, Attr +from weboob.browser.filters.standard import CleanDecimal, CleanText, Date, Regexp, Env, Async, AsyncLoad +from weboob.browser.filters.html import Link, Attr, TableCell from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.compat import unicode diff --git a/modules/lcl/enterprise/pages.py b/modules/lcl/enterprise/pages.py index ecdd600165..f14dddb4f8 100644 --- a/modules/lcl/enterprise/pages.py +++ b/modules/lcl/enterprise/pages.py @@ -22,8 +22,8 @@ from weboob.browser.pages import HTMLPage, LoggedPage, pagination from weboob.browser.elements import ListElement, ItemElement, TableElement, method -from weboob.browser.filters.standard import CleanText, Date, CleanDecimal, Env, TableCell -from weboob.browser.filters.html import Link +from weboob.browser.filters.standard import CleanText, Date, CleanDecimal, Env +from weboob.browser.filters.html import Link, TableCell from weboob.capabilities.bank import Account from weboob.capabilities.profile import Profile from weboob.capabilities.base import NotAvailable diff --git a/modules/lcl/pages.py b/modules/lcl/pages.py index d8bd46f9cc..8cacdcc36a 100644 --- a/modules/lcl/pages.py +++ b/modules/lcl/pages.py @@ -36,10 +36,10 @@ from weboob.exceptions import ParseError from weboob.browser.exceptions import ServerError from weboob.browser.pages import LoggedPage, HTMLPage, FormNotFound, pagination -from weboob.browser.filters.html import Attr, Link +from weboob.browser.filters.html import Attr, Link, TableCell from weboob.browser.filters.standard import CleanText, Field, Regexp, Format, Date, \ CleanDecimal, Map, AsyncLoad, Async, Env, \ - TableCell, Eval, Slugify + Eval, Slugify from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard, VirtKeyboardError diff --git a/modules/linebourse/pages.py b/modules/linebourse/pages.py index 5b7b98b642..2edd9756d6 100644 --- a/modules/linebourse/pages.py +++ b/modules/linebourse/pages.py @@ -24,8 +24,9 @@ from weboob.browser.pages import HTMLPage, LoggedPage from weboob.browser.elements import method, TableElement, ItemElement from weboob.browser.filters.standard import ( - CleanText, Date, TableCell, CleanDecimal, Regexp, Eval, Field + CleanText, Date, CleanDecimal, Regexp, Eval, Field ) +from weboob.browser.filters.html import TableCell from weboob.capabilities.base import NotAvailable from weboob.capabilities.bank import Investment from weboob.tools.capabilities.bank.transactions import FrenchTransaction as Transaction diff --git a/modules/lolix/pages.py b/modules/lolix/pages.py index 3c413ec579..4a8cf49fa1 100644 --- a/modules/lolix/pages.py +++ b/modules/lolix/pages.py @@ -20,8 +20,8 @@ from weboob.browser.pages import HTMLPage from weboob.browser.elements import TableElement, ItemElement, method -from weboob.browser.filters.standard import CleanText, TableCell, Regexp, Date, Env, BrowserURL, Join, Format -from weboob.browser.filters.html import CleanHTML +from weboob.browser.filters.standard import CleanText, Regexp, Date, Env, BrowserURL, Join, Format +from weboob.browser.filters.html import CleanHTML, TableCell from weboob.capabilities.job import BaseJobAdvert diff --git a/modules/materielnet/pages.py b/modules/materielnet/pages.py index b0de25c80a..f9894f0793 100644 --- a/modules/materielnet/pages.py +++ b/modules/materielnet/pages.py @@ -21,9 +21,9 @@ import re from weboob.browser.pages import HTMLPage, LoggedPage, pagination -from weboob.browser.filters.standard import CleanText, CleanDecimal, Env, Format, TableCell, Date, Async, AsyncLoad +from weboob.browser.filters.standard import CleanText, CleanDecimal, Env, Format, Date, Async, AsyncLoad from weboob.browser.elements import ListElement, ItemElement, TableElement, method -from weboob.browser.filters.html import Attr, Link +from weboob.browser.filters.html import Attr, Link, TableCell from weboob.capabilities.bill import Bill, Subscription from weboob.capabilities.base import NotAvailable diff --git a/modules/onlinenet/pages.py b/modules/onlinenet/pages.py index 3d62843124..3c3818f666 100644 --- a/modules/onlinenet/pages.py +++ b/modules/onlinenet/pages.py @@ -21,9 +21,9 @@ import re from weboob.browser.pages import HTMLPage, LoggedPage -from weboob.browser.filters.standard import CleanText, CleanDecimal, Env, Format, TableCell, Date +from weboob.browser.filters.standard import CleanText, CleanDecimal, Env, Format, Date +from weboob.browser.filters.html import Attr, TableCell from weboob.browser.elements import ListElement, ItemElement, TableElement, method -from weboob.browser.filters.html import Attr from weboob.capabilities.bill import Bill, Document, Subscription from weboob.capabilities.base import NotAvailable diff --git a/modules/orange/bill/pages/bills.py b/modules/orange/bill/pages/bills.py index b4844cb515..0db8668965 100644 --- a/modules/orange/bill/pages/bills.py +++ b/modules/orange/bill/pages/bills.py @@ -25,8 +25,8 @@ from weboob.browser.pages import HTMLPage, LoggedPage from weboob.capabilities.bill import Subscription from weboob.browser.elements import ListElement, ItemElement, method, TableElement -from weboob.browser.filters.standard import CleanDecimal, CleanText, Env, Field, Regexp, Date, Currency, TableCell -from weboob.browser.filters.html import Link +from weboob.browser.filters.standard import CleanDecimal, CleanText, Env, Field, Regexp, Date, Currency +from weboob.browser.filters.html import Link, TableCell from weboob.browser.filters.javascript import JSValue from weboob.capabilities.base import NotAvailable from weboob.capabilities.bill import Bill, Document diff --git a/modules/s2e/pages.py b/modules/s2e/pages.py index 81951b20a6..bbd50a5954 100644 --- a/modules/s2e/pages.py +++ b/modules/s2e/pages.py @@ -25,8 +25,8 @@ from weboob.browser.pages import HTMLPage, XMLPage, RawPage, LoggedPage, pagination from weboob.browser.elements import ItemElement, TableElement, SkipItem, method -from weboob.browser.filters.standard import CleanText, Date, Regexp, Eval, CleanDecimal, Env, TableCell, Field -from weboob.browser.filters.html import Attr +from weboob.browser.filters.standard import CleanText, Date, Regexp, Eval, CleanDecimal, Env, Field +from weboob.browser.filters.html import Attr, TableCell from weboob.capabilities.bank import Account, Investment, Pocket, Transaction from weboob.capabilities.base import NotAvailable from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard diff --git a/modules/spirica/pages.py b/modules/spirica/pages.py index b668a0af54..8dddef1187 100644 --- a/modules/spirica/pages.py +++ b/modules/spirica/pages.py @@ -22,8 +22,8 @@ from weboob.browser.pages import HTMLPage, LoggedPage from weboob.browser.elements import ItemElement, TableElement, method from weboob.browser.filters.standard import CleanText, Date, Regexp, CleanDecimal, \ - TableCell, Field, Async, AsyncLoad, Eval -from weboob.browser.filters.html import Attr, Link + Field, Async, AsyncLoad, Eval +from weboob.browser.filters.html import Attr, Link, TableCell from weboob.capabilities.bank import Account, Investment, Transaction from weboob.capabilities.base import NotAvailable, empty from weboob.exceptions import BrowserUnavailable diff --git a/modules/transilien/pages.py b/modules/transilien/pages.py index 26cbe65486..41402ca032 100644 --- a/modules/transilien/pages.py +++ b/modules/transilien/pages.py @@ -24,10 +24,10 @@ from weboob.browser.elements import TableElement, ItemElement, DictElement, method from weboob.capabilities.travel import Station, Departure, RoadStep from weboob.capabilities import NotAvailable -from weboob.browser.filters.standard import CleanText, TableCell, Filter, Time, Env, Regexp, Duration,\ +from weboob.browser.filters.standard import CleanText, Filter, Time, Env, Regexp, Duration,\ Format, Join, DateTime from weboob.browser.filters.json import Dict -from weboob.browser.filters.html import Link +from weboob.browser.filters.html import Link, TableCell class RoadMapDuration(Duration): diff --git a/modules/vlille/pages.py b/modules/vlille/pages.py index 2d0a40ef20..d9d4b1d8fd 100644 --- a/modules/vlille/pages.py +++ b/modules/vlille/pages.py @@ -20,7 +20,8 @@ from weboob.browser.pages import HTMLPage, XMLPage from weboob.browser.elements import ListElement, ItemElement, TableElement, method -from weboob.browser.filters.standard import CleanText, TableCell, Filter +from weboob.browser.filters.standard import CleanText, Filter +from weboob.browser.filters.html import TableCell from weboob.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor from weboob.capabilities.base import NotLoaded -- GitLab