Commit 7e0685af authored by Vincent Ardisson's avatar Vincent Ardisson Committed by Romain Bignon

modules: import TableCell from filters.html instead of filters.standard

parent 345d2599
......@@ -24,8 +24,8 @@ from decimal import Decimal, InvalidOperation
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
......
......@@ -24,9 +24,9 @@ from weboob.browser.pages import HTMLPage, LoggedPage, pagination
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
......
......@@ -25,8 +25,8 @@ from six.moves.html_parser import HTMLParser
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
......
......@@ -29,9 +29,9 @@ from PIL import Image
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
......
......@@ -29,11 +29,11 @@ from datetime import date
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
......
......@@ -27,8 +27,8 @@ from weboob.exceptions import BrowserUnavailable
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
......
......@@ -22,9 +22,9 @@ import re
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
......
......@@ -29,8 +29,8 @@ from datetime import datetime
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
......
......@@ -24,9 +24,9 @@ import re
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
......
......@@ -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
......
......@@ -23,8 +23,8 @@ import re
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
......
......@@ -24,9 +24,9 @@ from collections import OrderedDict
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
......
......@@ -24,8 +24,8 @@ import datetime
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
......
......@@ -38,10 +38,8 @@ from weboob.tools.date import parse_french_date, LinearDateGuesser
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):
......
......@@ -25,8 +25,8 @@ import re
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
......
......@@ -17,11 +17,9 @@
# You should have received a copy of the GNU Affero General Public License
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
import re
import hashlib
from decimal import Decimal, InvalidOperation
from dateutil.relativedelta import relativedelta
from datetime import date, datetime
......@@ -30,9 +28,9 @@ from collections import OrderedDict
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
......
......@@ -23,7 +23,8 @@ import re
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
......
......@@ -29,9 +29,9 @@ from weboob.exceptions import BrowserIncorrectPassword, BrowserUnavailable, Acti
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
......
......@@ -11,9 +11,9 @@ from weboob.tools.capabilities.bank.transactions import FrenchTransaction
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
......
......@@ -29,10 +29,9 @@ from weboob.browser.pages import HTMLPage, LoggedPage
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
......
......@@ -26,8 +26,8 @@ from weboob.capabilities.base import NotAvailable
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
......
......@@ -22,8 +22,8 @@ import re, requests
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
......
......@@ -36,10 +36,10 @@ from weboob.browser.elements import method, ListElement, TableElement, ItemEleme
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
......
......@@ -24,8 +24,9 @@ import re
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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -25,8 +25,8 @@ import HTMLParser
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
......
......@@ -25,8 +25,8 @@ from lxml import objectify
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
......
......@@ -22,8 +22,8 @@ import re
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
......
......@@ -24,10 +24,10 @@ from weboob.browser.pages import JsonPage, HTMLPage
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):
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment