Move ItemListTable-Element outside of page.py
One of the goal is to not import all modules needed by filters by loading the page file. In the same goal, move the import of parsers in the class definition.
This commit is contained in:
parent
f7cd0abc3b
commit
76cb004eb4
33 changed files with 305 additions and 265 deletions
|
|
@ -21,7 +21,8 @@
|
|||
import datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, LoggedPage, method, ItemElement
|
||||
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.capabilities.bank import Account
|
||||
from weboob.tools.capabilities.bank.transactions import FrenchTransaction as Transaction
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@ import re
|
|||
from cStringIO import StringIO
|
||||
|
||||
from weboob.capabilities.bank import Account
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement, LoggedPage
|
||||
from weboob.tools.browser2.page import HTMLPage, method, LoggedPage
|
||||
from weboob.tools.browser2.elements import ListElement, ItemElement
|
||||
from weboob.tools.browser2.filters import ParseError, CleanText, Regexp, Attr, CleanDecimal, Env
|
||||
from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard, VirtKeyboardError
|
||||
from weboob.tools.capabilities.bank.transactions import FrenchTransaction
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@ from datetime import datetime, time
|
|||
import weboob.tools.date as date_util
|
||||
from .calendar import BiplanCalendarEventConcert, BiplanCalendarEventTheatre
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ItemElement, SkipItem, ListElement
|
||||
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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,8 @@
|
|||
|
||||
import re
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, ListElement, ItemElement, method, LoggedPage
|
||||
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.capabilities.bank import Account
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ItemElement, TableElement
|
||||
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.capabilities.job import BaseJobAdvert
|
||||
|
|
|
|||
|
|
@ -27,7 +27,8 @@ from decimal import Decimal
|
|||
import re
|
||||
from dateutil.relativedelta import relativedelta
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement, SkipItem, FormNotFound, LoggedPage
|
||||
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.exceptions import BrowserIncorrectPassword
|
||||
from weboob.capabilities import NotAvailable
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement
|
||||
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.capabilities.gauge import GaugeMeasure, GaugeSensor
|
||||
from weboob.capabilities.base import NotAvailable
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ from datetime import datetime
|
|||
|
||||
from weboob.capabilities.messages import Message
|
||||
from weboob.capabilities.collection import Collection
|
||||
from weboob.tools.browser2.page import JsonPage, ListElement, method, ItemElement
|
||||
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
|
||||
|
||||
__all__ = ['TokenPage', 'ContentsPage', 'PreferencesPage']
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ from weboob.capabilities.video import BaseVideo
|
|||
|
||||
from datetime import timedelta
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ItemElement, ListElement, JsonPage
|
||||
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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@ import lxml.html as html
|
|||
from datetime import datetime
|
||||
from decimal import Decimal
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ItemElement, ListElement, LoggedPage
|
||||
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,\
|
||||
CleanDecimal, Regexp, Field, DateTime, Format, Env
|
||||
from weboob.capabilities.bill import Detail, Bill
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@
|
|||
|
||||
from .history import BadUTF8Page
|
||||
from weboob.capabilities.bill import Subscription
|
||||
from weboob.tools.browser2.page import method, ListElement, ItemElement
|
||||
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
|
||||
|
||||
__all__ = ['HomePage']
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@
|
|||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, TableElement, ItemElement, LoggedPage
|
||||
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.capabilities.bank import Account, Transaction
|
||||
from weboob.tools.date import LinearDateGuesser
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ from weboob.capabilities.bank import Account
|
|||
from weboob.tools.capabilities.bank.transactions import FrenchTransaction
|
||||
|
||||
from weboob.tools.exceptions import BrowserIncorrectPassword
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement, SkipItem, LoggedPage, pagination
|
||||
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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@ from .calendar import HybrideCalendarEvent
|
|||
import weboob.tools.date as date_util
|
||||
import re
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ItemElement, SkipItem, ListElement
|
||||
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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@
|
|||
|
||||
from datetime import timedelta, datetime
|
||||
import re
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement, pagination
|
||||
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.capabilities.job import BaseJobAdvert
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@ import re
|
|||
|
||||
from weboob.capabilities.bank import Account
|
||||
from weboob.capabilities.base import NotAvailable
|
||||
from weboob.tools.browser2.page import HTMLPage, LoggedPage, method, ListElement, ItemElement
|
||||
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.capabilities.bank.transactions import FrenchTransaction
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,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.page import ListElement, ItemElement, method, pagination
|
||||
from weboob.tools.browser2.page import method, pagination
|
||||
from weboob.tools.browser2.elements import ListElement, ItemElement
|
||||
|
||||
|
||||
__all__ = ['BillsPage']
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@
|
|||
from decimal import Decimal
|
||||
|
||||
from weboob.capabilities.bank import Investment
|
||||
from weboob.tools.browser2.page import RawPage, HTMLPage, method, ListElement, ItemElement
|
||||
from weboob.tools.browser2.page import RawPage, HTMLPage, method
|
||||
from weboob.tools.browser2.elements import ListElement, ItemElement
|
||||
from weboob.tools.browser2.filters import CleanDecimal, CleanText, Date
|
||||
from weboob.tools.capabilities.bank.transactions import FrenchTransaction
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@
|
|||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from weboob.capabilities.bank import Recipient, AccountNotFound, Transfer
|
||||
from weboob.tools.browser2.page import HTMLPage, LoggedPage, ListElement, ItemElement, method
|
||||
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 .login import INGVirtKeyboard
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ import requests
|
|||
from weboob.tools.capabilities.bank.transactions import FrenchTransaction
|
||||
from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard, VirtKeyboardError
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement, LoggedPage, pagination
|
||||
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, ParseError
|
||||
|
||||
__all__ = ['LoginPage', 'IndexPage', 'OperationsPage']
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ import re
|
|||
|
||||
from weboob.capabilities.paste import BasePaste, PasteNotFound
|
||||
from weboob.tools.browser2.filters import CleanText, DateTime, Env, RawText, Regexp
|
||||
from weboob.tools.browser2.page import HTMLPage, ItemElement, method, PagesBrowser, URL
|
||||
from weboob.tools.browser2.page import HTMLPage, method, PagesBrowser, URL
|
||||
from weboob.tools.browser2.elements import ItemElement
|
||||
from weboob.tools.exceptions import BrowserHTTPNotFound
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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.filters import Attr, Base, CleanText, DateTime, Env, Filter, FilterError, RawText
|
||||
from weboob.tools.browser2.page import ItemElement, method, RawPage
|
||||
from weboob.tools.browser2.page import method, RawPage
|
||||
from weboob.tools.browser2.elements import ItemElement
|
||||
from weboob.tools.exceptions import BrowserHTTPNotFound, BrowserIncorrectPassword, BrowserUnavailable
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@
|
|||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from weboob.tools.exceptions import BrowserBanned
|
||||
from weboob.tools.browser2.page import HTMLPage, LoggedPage, method, ListElement, ItemElement, pagination
|
||||
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.capabilities.bill import Subscription, Detail
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ItemElement, SkipItem, ListElement
|
||||
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.date import LinearDateGuesser
|
||||
from weboob.capabilities.job import BaseJobAdvert
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement
|
||||
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.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor
|
||||
from weboob.capabilities.base import NotAvailable, NotLoaded
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ from .calendar import SensCritiquenCalendarEvent
|
|||
|
||||
from datetime import date, datetime, time, timedelta
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, method, ItemElement, ListElement, JsonPage
|
||||
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
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@ from io import StringIO
|
|||
import lxml.html as html
|
||||
import urllib
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, JsonPage, method, ListElement, ItemElement, FormNotFound, pagination
|
||||
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.capabilities.messages import Thread, Message
|
||||
from weboob.capabilities.base import BaseObject
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@
|
|||
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
from weboob.tools.browser2.page import HTMLPage, XMLPage, method, ListElement, ItemElement, TableElement
|
||||
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.capabilities.gauge import Gauge, GaugeMeasure, GaugeSensor
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@
|
|||
|
||||
|
||||
from weboob.tools.browser2 import HTMLPage
|
||||
from weboob.tools.browser2.page import ListElement, method, ItemElement, pagination
|
||||
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.capabilities.base import NotAvailable
|
||||
from weboob.capabilities.image import BaseImage
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
|
||||
import re
|
||||
|
||||
from weboob.tools.browser2 import HTMLPage
|
||||
from weboob.tools.browser2.page import method, ItemElement
|
||||
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.capabilities.video import BaseVideo
|
||||
from weboob.tools.misc import to_unicode
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue