From 54a1bc48094d595a753d85741e0f52589b3838a3 Mon Sep 17 00:00:00 2001 From: Florent Date: Sat, 27 Sep 2014 22:01:37 +0200 Subject: [PATCH] Remove * imports in filters --- modules/agendadulibre/pages.py | 3 ++- modules/alloresto/pages.py | 2 +- modules/banqueaccord/pages.py | 3 ++- modules/biplan/pages.py | 3 ++- modules/carrefourbanque/pages.py | 3 ++- modules/cci/pages.py | 3 ++- modules/creditmutuel/pages.py | 3 ++- modules/dresdenwetter/pages.py | 2 +- modules/feedly/pages.py | 4 +++- modules/francetelevisions/pages.py | 4 +++- modules/freemobile/pages/history.py | 3 ++- modules/freemobile/pages/homepage.py | 3 ++- modules/groupamaes/pages.py | 2 +- modules/hsbc/pages.py | 3 ++- modules/hybride/pages.py | 3 ++- modules/indeed/pages.py | 3 ++- modules/ing/pages/accounts_list.py | 3 ++- modules/ing/pages/bills.py | 3 ++- modules/ing/pages/titre.py | 2 +- modules/ing/pages/transfer.py | 3 ++- modules/leboncoin/pages.py | 3 ++- modules/mareeinfo/pages.py | 3 ++- modules/oney/pages.py | 2 +- modules/pastealacon/browser.py | 2 +- modules/pastebin/browser.py | 3 ++- modules/poivy/pages.py | 3 ++- modules/razibus/pages.py | 3 ++- modules/regionsjob/pages.py | 3 ++- modules/sachsen/pages.py | 3 ++- modules/senscritique/pages.py | 3 ++- modules/transilien/pages.py | 4 +++- modules/twitter/pages.py | 3 ++- modules/vimeo/pages.py | 3 ++- modules/vlille/pages.py | 2 +- modules/youjizz/pages/index.py | 3 ++- modules/youjizz/pages/video.py | 2 +- weboob/tools/browser2/filters/__init__.py | 5 ----- weboob/tools/capabilities/bank/transactions.py | 2 +- 38 files changed, 68 insertions(+), 42 deletions(-) diff --git a/modules/agendadulibre/pages.py b/modules/agendadulibre/pages.py index 6c835eff..c1cce2b0 100644 --- a/modules/agendadulibre/pages.py +++ b/modules/agendadulibre/pages.py @@ -19,7 +19,8 @@ from weboob.tools.browser2.page import HTMLPage, method, pagination from weboob.tools.browser2.elements import ItemElement, ListElement -from weboob.tools.browser2.filters import Regexp, Link, CleanText, DateTime, Filter, Type, Env, XPath, Format, CleanHTML, CombineDate +from weboob.tools.browser2.filters.standard import Regexp, CleanText, DateTime, Filter, Type, Env, Format, CombineDate +from weboob.tools.browser2.filters.html import Link, XPath, CleanHTML from .calendar import AgendaDuLibreCalendarEvent from datetime import time, datetime, date diff --git a/modules/alloresto/pages.py b/modules/alloresto/pages.py index 987e92a5..fea5935d 100644 --- a/modules/alloresto/pages.py +++ b/modules/alloresto/pages.py @@ -23,7 +23,7 @@ from decimal import Decimal from weboob.tools.browser2.page import HTMLPage, LoggedPage, method from weboob.tools.browser2.elements import ItemElement -from weboob.tools.browser2.filters import CleanDecimal, CleanText, Filter, TableCell +from weboob.tools.browser2.filters.standard import CleanDecimal, CleanText, Filter, TableCell from weboob.capabilities.bank import Account from weboob.tools.capabilities.bank.transactions import FrenchTransaction as Transaction diff --git a/modules/banqueaccord/pages.py b/modules/banqueaccord/pages.py index 0fb87bcb..6a8adc61 100644 --- a/modules/banqueaccord/pages.py +++ b/modules/banqueaccord/pages.py @@ -26,7 +26,8 @@ from cStringIO import StringIO from weboob.capabilities.bank import Account from weboob.tools.browser2.page import HTMLPage, method, LoggedPage from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import CleanText, Regexp, Attr, CleanDecimal, Env +from weboob.tools.browser2.filters.standard import CleanText, Regexp, CleanDecimal, Env +from weboob.tools.browser2.filters.html import Attr from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard, VirtKeyboardError from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.exceptions import ParseError diff --git a/modules/biplan/pages.py b/modules/biplan/pages.py index 1f1547ee..bb325127 100644 --- a/modules/biplan/pages.py +++ b/modules/biplan/pages.py @@ -25,7 +25,8 @@ from .calendar import BiplanCalendarEventConcert, BiplanCalendarEventTheatre from weboob.tools.browser2.elements import ItemElement, SkipItem, ListElement from weboob.tools.browser2.page import HTMLPage, method -from weboob.tools.browser2.filters import Filter, Link, CleanText, Env, Regexp, CombineDate, CleanHTML +from weboob.tools.browser2.filters.standard import Filter, CleanText, Env, Regexp, CombineDate +from weboob.tools.browser2.filters.html import Link, CleanHTML class BiplanPrice(Filter): diff --git a/modules/carrefourbanque/pages.py b/modules/carrefourbanque/pages.py index 6f56db92..8e270278 100644 --- a/modules/carrefourbanque/pages.py +++ b/modules/carrefourbanque/pages.py @@ -22,7 +22,8 @@ import re from weboob.tools.browser2.page import HTMLPage, method, LoggedPage from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import Regexp, CleanText, CleanDecimal, Format, Link +from weboob.tools.browser2.filters.standard import Regexp, CleanText, CleanDecimal, Format +from weboob.tools.browser2.filters.html import Link from weboob.capabilities.bank import Account from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/modules/cci/pages.py b/modules/cci/pages.py index 27eca2df..f7d06356 100644 --- a/modules/cci/pages.py +++ b/modules/cci/pages.py @@ -19,7 +19,8 @@ from weboob.tools.browser2.page import HTMLPage, method from weboob.tools.browser2.elements import ItemElement, TableElement -from weboob.tools.browser2.filters import Filter, Link, CleanText, Format, Env, DateTime, CleanHTML, TableCell, Join +from weboob.tools.browser2.filters.standard import Filter, CleanText, Format, Env, DateTime, TableCell, Join +from weboob.tools.browser2.filters.html import Link, CleanHTML from weboob.capabilities.job import BaseJobAdvert diff --git a/modules/creditmutuel/pages.py b/modules/creditmutuel/pages.py index 0f7a1dfa..ed4a4d49 100644 --- a/modules/creditmutuel/pages.py +++ b/modules/creditmutuel/pages.py @@ -29,7 +29,8 @@ from dateutil.relativedelta import relativedelta from weboob.tools.browser2.page import HTMLPage, method, FormNotFound, LoggedPage from weboob.tools.browser2.elements import ListElement, ItemElement, SkipItem -from weboob.tools.browser2.filters import Filter, Env, CleanText, CleanDecimal, Link, Field, TableCell +from weboob.tools.browser2.filters.standard import Filter, Env, CleanText, CleanDecimal, Field, TableCell +from weboob.tools.browser2.filters.html import Link from weboob.tools.exceptions import BrowserIncorrectPassword from weboob.capabilities import NotAvailable from weboob.capabilities.bank import Account diff --git a/modules/dresdenwetter/pages.py b/modules/dresdenwetter/pages.py index 08f0f87d..f67c4f61 100644 --- a/modules/dresdenwetter/pages.py +++ b/modules/dresdenwetter/pages.py @@ -19,7 +19,7 @@ from weboob.tools.browser2.page import HTMLPage, method from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import CleanText, Regexp, Field, Filter +from weboob.tools.browser2.filters.standard import CleanText, Regexp, Field, Filter from weboob.capabilities.gauge import GaugeMeasure, GaugeSensor from weboob.capabilities.base import NotAvailable diff --git a/modules/feedly/pages.py b/modules/feedly/pages.py index 8cb4c39a..3aa2fe82 100644 --- a/modules/feedly/pages.py +++ b/modules/feedly/pages.py @@ -23,7 +23,9 @@ from weboob.capabilities.messages import Message from weboob.capabilities.collection import Collection from weboob.tools.browser2.page import JsonPage, method from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import CleanText, Dict, Format, CleanHTML +from weboob.tools.browser2.filters.standard import CleanText, Format +from weboob.tools.browser2.filters.json import Dict +from weboob.tools.browser2.filters.html import CleanHTML class DictElement(ListElement): diff --git a/modules/francetelevisions/pages.py b/modules/francetelevisions/pages.py index a1c6e698..3500a7bd 100644 --- a/modules/francetelevisions/pages.py +++ b/modules/francetelevisions/pages.py @@ -24,7 +24,9 @@ from datetime import timedelta from weboob.tools.browser2.page import HTMLPage, method, JsonPage from weboob.tools.browser2.elements import ItemElement, ListElement -from weboob.tools.browser2.filters import Filter, Link, CleanText, Regexp, Attr, Format, DateTime, Env, Dict, Duration, XPath +from weboob.tools.browser2.filters.standard import Filter, CleanText, Regexp, Format, DateTime, Env, Duration +from weboob.tools.browser2.filters.html import Link, Attr, XPath +from weboob.tools.browser2.filters.json import Dict class DurationPluzz(Filter): diff --git a/modules/freemobile/pages/history.py b/modules/freemobile/pages/history.py index 24c6e33d..5cb8d58c 100644 --- a/modules/freemobile/pages/history.py +++ b/modules/freemobile/pages/history.py @@ -26,8 +26,9 @@ from decimal import Decimal from weboob.tools.browser2.page import HTMLPage, method, LoggedPage from weboob.tools.browser2.elements import ItemElement, ListElement -from weboob.tools.browser2.filters import Date, CleanText, Attr, Filter,\ +from weboob.tools.browser2.filters.standard import Date, CleanText, Filter,\ CleanDecimal, Regexp, Field, DateTime, Format, Env +from weboob.tools.browser2.filters.html import Attr from weboob.capabilities.bill import Detail, Bill diff --git a/modules/freemobile/pages/homepage.py b/modules/freemobile/pages/homepage.py index ce63f66b..9269b2be 100644 --- a/modules/freemobile/pages/homepage.py +++ b/modules/freemobile/pages/homepage.py @@ -21,7 +21,8 @@ from .history import BadUTF8Page from weboob.capabilities.bill import Subscription from weboob.tools.browser2.page import method from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import CleanText, Attr, Field, Format, Filter +from weboob.tools.browser2.filters.standard import CleanText, Field, Format, Filter +from weboob.tools.browser2.filters.html import Attr class GetID(Filter): diff --git a/modules/groupamaes/pages.py b/modules/groupamaes/pages.py index e4f30bc1..e8d2646d 100644 --- a/modules/groupamaes/pages.py +++ b/modules/groupamaes/pages.py @@ -20,7 +20,7 @@ from weboob.tools.browser2.page import HTMLPage, method, LoggedPage from weboob.tools.browser2.elements import TableElement, ItemElement -from weboob.tools.browser2.filters import CleanText, CleanDecimal, TableCell, Date +from weboob.tools.browser2.filters.standard import CleanText, CleanDecimal, TableCell, Date from weboob.capabilities.bank import Account, Transaction from weboob.tools.date import LinearDateGuesser diff --git a/modules/hsbc/pages.py b/modules/hsbc/pages.py index 409edfd2..0835ad4f 100644 --- a/modules/hsbc/pages.py +++ b/modules/hsbc/pages.py @@ -27,7 +27,8 @@ from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.exceptions import BrowserIncorrectPassword from weboob.tools.browser2.elements import ListElement, ItemElement, SkipItem from weboob.tools.browser2.page import HTMLPage, method, LoggedPage, pagination -from weboob.tools.browser2.filters import Filter, Env, CleanText, CleanDecimal, Link, Field, DateGuesser, TableCell +from weboob.tools.browser2.filters.standard import Filter, Env, CleanText, CleanDecimal, Field, DateGuesser, TableCell +from weboob.tools.browser2.filters.html import Link class Transaction(FrenchTransaction): diff --git a/modules/hybride/pages.py b/modules/hybride/pages.py index 0beec300..a5090415 100644 --- a/modules/hybride/pages.py +++ b/modules/hybride/pages.py @@ -25,7 +25,8 @@ import re from weboob.tools.browser2.page import HTMLPage, method from weboob.tools.browser2.elements import ItemElement, SkipItem, ListElement -from weboob.tools.browser2.filters import Filter, Link, CleanText, Env +from weboob.tools.browser2.filters.standard import Filter, CleanText, Env +from weboob.tools.browser2.filters.html import Link def format_date(date): diff --git a/modules/indeed/pages.py b/modules/indeed/pages.py index 696d3f40..d1efcc79 100644 --- a/modules/indeed/pages.py +++ b/modules/indeed/pages.py @@ -21,7 +21,8 @@ from datetime import timedelta, datetime import re from weboob.tools.browser2.page import HTMLPage, method, pagination from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import Filter, CleanText, Regexp, Format, Env, CleanHTML, Attr +from weboob.tools.browser2.filters.standard import Filter, CleanText, Regexp, Format, Env +from weboob.tools.browser2.filters.html import CleanHTML, Attr from weboob.capabilities.job import BaseJobAdvert diff --git a/modules/ing/pages/accounts_list.py b/modules/ing/pages/accounts_list.py index 6e20ef14..cb54f530 100644 --- a/modules/ing/pages/accounts_list.py +++ b/modules/ing/pages/accounts_list.py @@ -26,7 +26,8 @@ from weboob.capabilities.bank import Account from weboob.capabilities.base import NotAvailable from weboob.tools.browser2.page import HTMLPage, LoggedPage, method from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import Attr, CleanText, CleanDecimal, Filter, Field, MultiFilter, Date, Lower +from weboob.tools.browser2.filters.standard import CleanText, CleanDecimal, Filter, Field, MultiFilter, Date, Lower +from weboob.tools.browser2.filters.html import Attr from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/modules/ing/pages/bills.py b/modules/ing/pages/bills.py index fdb6c25d..120cb9a7 100644 --- a/modules/ing/pages/bills.py +++ b/modules/ing/pages/bills.py @@ -19,7 +19,8 @@ from weboob.capabilities.bill import Bill, Subscription from weboob.tools.browser2 import HTMLPage, LoggedPage -from weboob.tools.browser2.filters import Filter, Attr, CleanText, Format, Field, Env +from weboob.tools.browser2.filters.standard import Filter, CleanText, Format, Field, Env +from weboob.tools.browser2.filters.html import Attr from weboob.tools.browser2.page import method, pagination from weboob.tools.browser2.elements import ListElement, ItemElement diff --git a/modules/ing/pages/titre.py b/modules/ing/pages/titre.py index fb7960dd..ee0c9231 100644 --- a/modules/ing/pages/titre.py +++ b/modules/ing/pages/titre.py @@ -23,7 +23,7 @@ from decimal import Decimal from weboob.capabilities.bank import Investment from weboob.tools.browser2.page import RawPage, HTMLPage, method, LoggedPage from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import CleanDecimal, CleanText, Date +from weboob.tools.browser2.filters.standard import CleanDecimal, CleanText, Date from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/modules/ing/pages/transfer.py b/modules/ing/pages/transfer.py index 85e3eb53..64777af0 100644 --- a/modules/ing/pages/transfer.py +++ b/modules/ing/pages/transfer.py @@ -20,7 +20,8 @@ from weboob.capabilities.bank import Recipient, AccountNotFound, Transfer from weboob.tools.browser2.page import HTMLPage, LoggedPage, method from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import CleanText, CleanDecimal, Attr, Format +from weboob.tools.browser2.filters.standard import CleanText, CleanDecimal, Format +from weboob.tools.browser2.filters.html import Attr from .login import INGVirtKeyboard diff --git a/modules/leboncoin/pages.py b/modules/leboncoin/pages.py index 2215ec28..6ccfecde 100644 --- a/modules/leboncoin/pages.py +++ b/modules/leboncoin/pages.py @@ -20,7 +20,8 @@ from decimal import Decimal from weboob.tools.browser2.page import HTMLPage, method, pagination from weboob.tools.browser2.elements import ItemElement, ListElement -from weboob.tools.browser2.filters import CleanText, Link, Regexp, CleanDecimal, Env, DateTime, Attr +from weboob.tools.browser2.filters.standard import CleanText, Regexp, CleanDecimal, Env, DateTime +from weboob.tools.browser2.filters.html import Attr, Link from weboob.capabilities.housing import City, Housing, HousingPhoto from datetime import date, timedelta from weboob.tools.date import DATE_TRANSLATE_FR, LinearDateGuesser diff --git a/modules/mareeinfo/pages.py b/modules/mareeinfo/pages.py index ac06ce38..6431eb63 100644 --- a/modules/mareeinfo/pages.py +++ b/modules/mareeinfo/pages.py @@ -19,7 +19,8 @@ from weboob.tools.browser2.page import HTMLPage, method from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import CleanText, Link, DateTime, CleanDecimal, Regexp, XPath +from weboob.tools.browser2.filters.standard import CleanText, DateTime, CleanDecimal, Regexp +from weboob.tools.browser2.filters.html import Link, XPath from weboob.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor from datetime import timedelta import re diff --git a/modules/oney/pages.py b/modules/oney/pages.py index 470db6c1..1441496c 100644 --- a/modules/oney/pages.py +++ b/modules/oney/pages.py @@ -27,7 +27,7 @@ from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard, VirtKeyboardEr from weboob.tools.browser2.page import HTMLPage, method, LoggedPage, pagination from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import Env, CleanDecimal +from weboob.tools.browser2.filters.standard import Env, CleanDecimal from weboob.tools.exceptions import ParseError diff --git a/modules/pastealacon/browser.py b/modules/pastealacon/browser.py index b672052b..193fdeb5 100644 --- a/modules/pastealacon/browser.py +++ b/modules/pastealacon/browser.py @@ -20,7 +20,7 @@ import re from weboob.capabilities.paste import BasePaste, PasteNotFound -from weboob.tools.browser2.filters import CleanText, DateTime, Env, RawText, Regexp +from weboob.tools.browser2.filters.standard import CleanText, DateTime, Env, RawText, Regexp from weboob.tools.browser2.page import HTMLPage, method, PagesBrowser, URL from weboob.tools.browser2.elements import ItemElement from weboob.tools.exceptions import BrowserHTTPNotFound diff --git a/modules/pastebin/browser.py b/modules/pastebin/browser.py index ecb3a0e8..830d550c 100644 --- a/modules/pastebin/browser.py +++ b/modules/pastebin/browser.py @@ -23,7 +23,8 @@ import re from weboob.capabilities.paste import BasePaste, PasteNotFound from weboob.tools.browser2 import HTMLPage, LoginBrowser, need_login, URL from weboob.tools.browser2.elements import ItemElement -from weboob.tools.browser2.filters import Attr, Base, CleanText, DateTime, Env, Filter, FilterError, RawText +from weboob.tools.browser2.filters.standard import Base, CleanText, DateTime, Env, Filter, FilterError, RawText +from weboob.tools.browser2.filters.html import Attr from weboob.tools.browser2.page import method, RawPage from weboob.tools.exceptions import BrowserHTTPNotFound, BrowserIncorrectPassword, BrowserUnavailable diff --git a/modules/poivy/pages.py b/modules/poivy/pages.py index 0795cdb5..a16752f2 100644 --- a/modules/poivy/pages.py +++ b/modules/poivy/pages.py @@ -20,7 +20,8 @@ from weboob.tools.exceptions import BrowserBanned from weboob.tools.browser2.page import HTMLPage, LoggedPage, method, pagination from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import CleanText, CleanDecimal, Field, Attr, DateTime, Link, Format +from weboob.tools.browser2.filters.standard import CleanText, CleanDecimal, Field, DateTime, Format +from weboob.tools.browser2.filters.html import Attr, Link from weboob.capabilities.bill import Subscription, Detail diff --git a/modules/razibus/pages.py b/modules/razibus/pages.py index 36b371e4..f4b2d7ec 100644 --- a/modules/razibus/pages.py +++ b/modules/razibus/pages.py @@ -23,7 +23,8 @@ from datetime import time from weboob.tools.browser2.page import HTMLPage, method from weboob.tools.browser2.elements import ItemElement, ListElement -from weboob.tools.browser2.filters import Regexp, Link, CleanText, DateTime, CombineDate, Filter, Env, CleanHTML +from weboob.tools.browser2.filters.html import CleanHTML, Link +from weboob.tools.browser2.filters.standard import Regexp, CleanText, DateTime, CombineDate, Filter, Env class EndTime(Filter): diff --git a/modules/regionsjob/pages.py b/modules/regionsjob/pages.py index e8646ca2..aac1b94f 100644 --- a/modules/regionsjob/pages.py +++ b/modules/regionsjob/pages.py @@ -19,7 +19,8 @@ from weboob.tools.browser2.page import HTMLPage, method from weboob.tools.browser2.elements import ItemElement, SkipItem, ListElement -from weboob.tools.browser2.filters import Link, CleanText, Regexp, Format, Env, DateGuesser, CleanHTML, DateTime +from weboob.tools.browser2.filters.standard import CleanText, Regexp, Format, Env, DateGuesser, DateTime +from weboob.tools.browser2.filters.html import Link, CleanHTML from weboob.tools.date import LinearDateGuesser from weboob.capabilities.job import BaseJobAdvert diff --git a/modules/sachsen/pages.py b/modules/sachsen/pages.py index ea579d61..43c468ae 100644 --- a/modules/sachsen/pages.py +++ b/modules/sachsen/pages.py @@ -19,7 +19,8 @@ from weboob.tools.browser2.page import HTMLPage, method from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import Env, CleanText, Regexp, Field, DateTime, Map, Attr +from weboob.tools.browser2.filters.standard import Env, CleanText, Regexp, Field, DateTime, Map +from weboob.tools.browser2.filters.html import Attr from weboob.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor from weboob.capabilities.base import NotAvailable, NotLoaded diff --git a/modules/senscritique/pages.py b/modules/senscritique/pages.py index cb7722b9..3b9828a6 100644 --- a/modules/senscritique/pages.py +++ b/modules/senscritique/pages.py @@ -24,7 +24,8 @@ from datetime import date, datetime, time, timedelta from weboob.tools.browser2.page import HTMLPage, method, JsonPage from weboob.tools.browser2.elements import ItemElement, ListElement -from weboob.tools.browser2.filters import Filter, Link, CleanText, Regexp, Attr, Join, Format +from weboob.tools.browser2.filters.standard import Filter, CleanText, Regexp, Join, Format +from weboob.tools.browser2.filters.html import Link, Attr class Channel(Filter): diff --git a/modules/transilien/pages.py b/modules/transilien/pages.py index 2f5c7862..af7e8af2 100644 --- a/modules/transilien/pages.py +++ b/modules/transilien/pages.py @@ -23,7 +23,9 @@ import re from weboob.tools.browser2.page import JsonPage, HTMLPage, method from weboob.tools.browser2.elements import TableElement, ItemElement, ListElement from weboob.capabilities.travel import Station, Departure, RoadStep -from weboob.tools.browser2.filters import Dict, CleanText, TableCell, Filter, DateTime, Env, Link, Regexp, Duration +from weboob.tools.browser2.filters.standard import CleanText, TableCell, Filter, DateTime, Env, Regexp, Duration +from weboob.tools.browser2.filters.json import Dict +from weboob.tools.browser2.filters.html import Link from weboob.tools.date import LinearDateGuesser diff --git a/modules/twitter/pages.py b/modules/twitter/pages.py index 8aa54c21..55c80477 100644 --- a/modules/twitter/pages.py +++ b/modules/twitter/pages.py @@ -25,7 +25,8 @@ import urllib from weboob.tools.browser2.page import HTMLPage, JsonPage, method, FormNotFound, pagination from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import CleanText, Format, Link, Regexp, Env, DateTime, Attr, Filter +from weboob.tools.browser2.filters.standard import CleanText, Format, Regexp, Env, DateTime, Filter +from weboob.tools.browser2.filters.html import Link, Attr from weboob.capabilities.messages import Thread, Message from weboob.capabilities.base import BaseObject diff --git a/modules/vimeo/pages.py b/modules/vimeo/pages.py index cf84f089..9d02a030 100644 --- a/modules/vimeo/pages.py +++ b/modules/vimeo/pages.py @@ -23,7 +23,8 @@ from weboob.capabilities.image import BaseImage from weboob.tools.exceptions import ParseError from weboob.tools.browser2.elements import ItemElement, ListElement from weboob.tools.browser2.page import HTMLPage, method, pagination, JsonPage -from weboob.tools.browser2.filters import Attr, Regexp, Link, Env, CleanText, DateTime, Duration, Field +from weboob.tools.browser2.filters.standard import Regexp, Env, CleanText, DateTime, Duration, Field +from weboob.tools.browser2.filters.html import Attr, Link import re diff --git a/modules/vlille/pages.py b/modules/vlille/pages.py index d8be06bd..3ef4a6fc 100644 --- a/modules/vlille/pages.py +++ b/modules/vlille/pages.py @@ -20,7 +20,7 @@ from weboob.tools.browser2.page import HTMLPage, XMLPage, method from weboob.tools.browser2.elements import ListElement, ItemElement, TableElement -from weboob.tools.browser2.filters import CleanText, TableCell, Filter +from weboob.tools.browser2.filters.standard import CleanText, TableCell, Filter from weboob.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor from weboob.capabilities.base import NotLoaded diff --git a/modules/youjizz/pages/index.py b/modules/youjizz/pages/index.py index ec79e509..13ab7d56 100644 --- a/modules/youjizz/pages/index.py +++ b/modules/youjizz/pages/index.py @@ -21,7 +21,8 @@ from weboob.tools.browser2 import HTMLPage from weboob.tools.browser2.page import method, pagination from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters import Link, CleanText, Duration, Regexp, CSS +from weboob.tools.browser2.filters.standard import CleanText, Duration, Regexp +from weboob.tools.browser2.filters.html import Link, CSS from weboob.capabilities.base import NotAvailable from weboob.capabilities.image import BaseImage from weboob.capabilities.video import BaseVideo diff --git a/modules/youjizz/pages/video.py b/modules/youjizz/pages/video.py index 81583143..cc66eedf 100644 --- a/modules/youjizz/pages/video.py +++ b/modules/youjizz/pages/video.py @@ -22,7 +22,7 @@ import re from weboob.tools.browser2.page import method, HTMLPage from weboob.tools.browser2.elements import ItemElement -from weboob.tools.browser2.filters import CleanText, Env, Duration +from weboob.tools.browser2.filters.standard import CleanText, Env, Duration from weboob.capabilities.video import BaseVideo from weboob.tools.misc import to_unicode diff --git a/weboob/tools/browser2/filters/__init__.py b/weboob/tools/browser2/filters/__init__.py index 2b7039c8..bb7fd413 100644 --- a/weboob/tools/browser2/filters/__init__.py +++ b/weboob/tools/browser2/filters/__init__.py @@ -16,8 +16,3 @@ # # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . - -from .standard import * # NOQA -from .html import * # NOQA -from .json import * # NOQA -from .javascript import * # NOQA diff --git a/weboob/tools/capabilities/bank/transactions.py b/weboob/tools/capabilities/bank/transactions.py index 6c150ed1..af3e7dd7 100644 --- a/weboob/tools/capabilities/bank/transactions.py +++ b/weboob/tools/capabilities/bank/transactions.py @@ -29,7 +29,7 @@ from weboob.tools.log import getLogger from weboob.tools.exceptions import ParseError from weboob.tools.browser2.elements import TableElement, ItemElement -from weboob.tools.browser2.filters import Filter, CleanText, CleanDecimal, TableCell +from weboob.tools.browser2.filters.standard import Filter, CleanText, CleanDecimal, TableCell __all__ = ['FrenchTransaction', 'AmericanTransaction']