From a019819f9dd9df7bd764fb8b85fb2db59f3756fe Mon Sep 17 00:00:00 2001 From: Florent Date: Thu, 2 Oct 2014 11:01:34 +0200 Subject: [PATCH] Move browser2 from weboob/tools/b2 to weboob/browser2 --- docs/source/guides/module.rst | 40 +++++++++---------- modules/agendadulibre/browser.py | 2 +- modules/agendadulibre/pages.py | 8 ++-- modules/alloresto/browser.py | 2 +- modules/alloresto/pages.py | 6 +-- modules/banqueaccord/browser.py | 2 +- modules/banqueaccord/pages.py | 8 ++-- modules/biplan/browser.py | 2 +- modules/biplan/pages.py | 8 ++-- modules/carrefourbanque/browser.py | 2 +- modules/carrefourbanque/pages.py | 8 ++-- modules/cci/browser.py | 2 +- modules/cci/pages.py | 8 ++-- modules/cmb/module.py | 2 +- modules/creditmutuel/browser.py | 2 +- modules/creditmutuel/pages.py | 8 ++-- modules/dresdenwetter/browser.py | 2 +- modules/dresdenwetter/pages.py | 6 +-- modules/feedly/browser.py | 2 +- modules/feedly/google.py | 2 +- modules/feedly/pages.py | 10 ++--- modules/francetelevisions/browser.py | 2 +- modules/francetelevisions/pages.py | 10 ++--- modules/freemobile/browser.py | 2 +- modules/freemobile/pages/history.py | 8 ++-- modules/freemobile/pages/homepage.py | 8 ++-- modules/freemobile/pages/login.py | 2 +- modules/groupamaes/browser.py | 2 +- modules/groupamaes/pages.py | 6 +-- modules/hsbc/browser.py | 2 +- modules/hsbc/pages.py | 8 ++-- modules/hybride/browser.py | 2 +- modules/hybride/pages.py | 8 ++-- modules/indeed/browser.py | 2 +- modules/indeed/pages.py | 8 ++-- modules/ing/browser.py | 2 +- modules/ing/pages/accounts_list.py | 8 ++-- modules/ing/pages/bills.py | 10 ++--- modules/ing/pages/login.py | 2 +- modules/ing/pages/titre.py | 6 +-- modules/ing/pages/transfer.py | 8 ++-- modules/leboncoin/browser.py | 2 +- modules/leboncoin/pages.py | 8 ++-- modules/mareeinfo/browser.py | 2 +- modules/mareeinfo/pages.py | 8 ++-- modules/oney/browser.py | 2 +- modules/oney/pages.py | 6 +-- modules/pastealacon/browser.py | 6 +-- modules/pastebin/browser.py | 10 ++--- modules/poivy/browser.py | 2 +- modules/poivy/pages.py | 8 ++-- modules/razibus/browser.py | 2 +- modules/razibus/pages.py | 8 ++-- modules/regionsjob/browser.py | 2 +- modules/regionsjob/pages.py | 8 ++-- modules/sachsen/browser.py | 2 +- modules/sachsen/pages.py | 8 ++-- modules/senscritique/browser.py | 2 +- modules/senscritique/pages.py | 8 ++-- modules/tinder/browser.py | 2 +- modules/transilien/browser.py | 2 +- modules/transilien/pages.py | 10 ++--- modules/twitter/browser.py | 2 +- modules/twitter/pages.py | 8 ++-- modules/vimeo/browser.py | 4 +- modules/vimeo/pages.py | 8 ++-- modules/vlille/browser.py | 2 +- modules/vlille/pages.py | 6 +-- modules/wellsfargo/browser.py | 2 +- modules/wellsfargo/pages.py | 2 +- modules/youjizz/browser.py | 2 +- modules/youjizz/pages/index.py | 10 ++--- modules/youjizz/pages/video.py | 6 +-- setup.cfg | 2 +- tools/boilerplate_data/base_browser.py | 2 +- tools/boilerplate_data/base_pages.py | 2 +- weboob/{tools => }/browser2/__init__.py | 0 weboob/{tools => }/browser2/browser.py | 0 weboob/{tools => }/browser2/cookies.py | 0 weboob/{tools => }/browser2/elements.py | 2 +- weboob/{tools => }/browser2/exceptions.py | 0 .../{tools => }/browser2/filters/__init__.py | 0 weboob/{tools => }/browser2/filters/html.py | 0 .../browser2/filters/javascript.py | 2 +- weboob/{tools => }/browser2/filters/json.py | 0 .../{tools => }/browser2/filters/standard.py | 4 +- weboob/{tools => }/browser2/page.py | 4 +- weboob/{tools => }/browser2/sessions.py | 0 weboob/core/repositories.py | 2 +- .../tools/capabilities/bank/transactions.py | 4 +- 90 files changed, 211 insertions(+), 211 deletions(-) rename weboob/{tools => }/browser2/__init__.py (100%) rename weboob/{tools => }/browser2/browser.py (100%) rename weboob/{tools => }/browser2/cookies.py (100%) rename weboob/{tools => }/browser2/elements.py (99%) rename weboob/{tools => }/browser2/exceptions.py (100%) rename weboob/{tools => }/browser2/filters/__init__.py (100%) rename weboob/{tools => }/browser2/filters/html.py (100%) rename weboob/{tools => }/browser2/filters/javascript.py (98%) rename weboob/{tools => }/browser2/filters/json.py (100%) rename weboob/{tools => }/browser2/filters/standard.py (99%) rename weboob/{tools => }/browser2/page.py (99%) rename weboob/{tools => }/browser2/sessions.py (100%) diff --git a/docs/source/guides/module.rst b/docs/source/guides/module.rst index d6f13622cd..8772b4f265 100644 --- a/docs/source/guides/module.rst +++ b/docs/source/guides/module.rst @@ -65,7 +65,7 @@ In a module directory, there are commonly these files: * **__init__.py** - needed in every python modules, it exports your :class:`Module ` class. * **module.py** - defines the main class of your module, which derives :class:`Module `. -* **browser.py** - your browser, derived from :class:`Browser `, is called by your module to interact with the supported website. +* **browser.py** - your browser, derived from :class:`Browser `, is called by your module to interact with the supported website. * **pages.py** - all website's pages handled by the browser are defined here * **test.py** - functional tests * **favicon.png** - a 64x64 transparent PNG icon @@ -179,14 +179,14 @@ what are expected returned objects, and what exceptions it may raises. Browser ******* -Most of modules use a class derived from :class:`PagesBrowser ` or -:class:`LoginBrowser ` (for authenticated websites) to interact with a website. +Most of modules use a class derived from :class:`PagesBrowser ` or +:class:`LoginBrowser ` (for authenticated websites) to interact with a website. Edit ``browser.py``:: # -*- coding: utf-8 -*- - from weboob.tools.browser2 import PagesBrowser + from weboob.browser2 import PagesBrowser __all__ = ['ExampleBrowser'] @@ -195,7 +195,7 @@ Edit ``browser.py``:: There are several possible class attributes: -* **BASEURL** - base url of website used for absolute paths given to :class:`open() ` or :class:`location() ` +* **BASEURL** - base url of website used for absolute paths given to :class:`open() ` or :class:`location() ` * **PROFILE** - defines the behavior of your browser against the website. By default this is Firefox, but you can import other profiles * **TIMEOUT** - defines the timeout for requests (defaults to 10 seconds) * **VERIFY** - SSL verification (if the protocol used is **https**) @@ -205,15 +205,15 @@ Pages For each page you want to handle, you have to create an associated class derived from one of these classes: -* :class:`HTMLPage ` - a HTML page -* :class:`XMLPage ` - a XML document -* :class:`JsonPage ` - a Json object +* :class:`HTMLPage ` - a HTML page +* :class:`XMLPage ` - a XML document +* :class:`JsonPage ` - a Json object In the file ``pages.py``, you can write, for example:: # -*- coding: utf-8 -*- - from weboob.tools.browser2.page import HTMLPage + from weboob.browser2.page import HTMLPage __all__ = ['IndexPage', 'ListPage'] @@ -227,9 +227,9 @@ In the file ``pages.py``, you can write, for example:: ``IndexPage`` is the class we will use to get information from the home page of the website, and ``ListPage`` will handle pages which list accounts. -Then, you have to declare them in your browser, with the :class:`URL ` object:: +Then, you have to declare them in your browser, with the :class:`URL ` object:: - from weboob.tools.browser2.page import PagesBrowser, URL + from weboob.browser2.page import PagesBrowser, URL from .pages import IndexPage, ListPage # ... @@ -257,9 +257,9 @@ For example, we can now implement some methods in ``ExampleBrowser``:: return self.page.iter_accounts_list() -When calling the :func:`go() ` method, it reads the first regexp url of our :class:`URL ` object, and go on the page. +When calling the :func:`go() ` method, it reads the first regexp url of our :class:`URL ` object, and go on the page. -:func:`stay_or_go() ` is used when you want to relocate on the page only if we aren't already on it. +:func:`stay_or_go() ` is used when you want to relocate on the page only if we aren't already on it. Once we are on the ``ListPage``, we can call every methods of the ``page`` object. @@ -295,8 +295,8 @@ the method :func:`create_default_browser ` and to implement the function -:func:`do_login `:: +On the browser side, you need to inherit from :func:`LoginBrowser ` and to implement the function +:func:`do_login `:: class ExampleBrowser(LoginBrowser): login = URL('/login', LoginPage) @@ -319,7 +319,7 @@ Also, your ``LoginPage`` may look like:: form['password'] = password form.submit() -Then, each method on your browser which need your user to be authenticated may be decorated by :func:`need_login `:: +Then, each method on your browser which need your user to be authenticated may be decorated by :func:`need_login `:: class ExampleBrowser(LoginBrowser): accounts = URL('/accounts$', ListPage) @@ -329,9 +329,9 @@ Then, each method on your browser which need your user to be authenticated may b self.accounts.stay_or_go() return self.page.get_accounts() -The last thing to know is that :func:`need_login ` checks if the current page is a logged one by -reading the attribute :func:`logged ` of the instance. You can either define it yourself, as a -class boolean attribute or as a property, or to inherit your class from :class:`LoggedPage `. +The last thing to know is that :func:`need_login ` checks if the current page is a logged one by +reading the attribute :func:`logged ` of the instance. You can either define it yourself, as a +class boolean attribute or as a property, or to inherit your class from :class:`LoggedPage `. Parsing of pages @@ -342,7 +342,7 @@ Parsing of pages When your browser locates on a page, an instance of the class related to the -:class:`URL ` attribute which matches the url +:class:`URL ` attribute which matches the url is created. You can declare methods on your class to allow your browser to interact with it. diff --git a/modules/agendadulibre/browser.py b/modules/agendadulibre/browser.py index 42cb94340c..ef119687ef 100644 --- a/modules/agendadulibre/browser.py +++ b/modules/agendadulibre/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import EventListPage, EventPage from datetime import timedelta, date diff --git a/modules/agendadulibre/pages.py b/modules/agendadulibre/pages.py index c1cce2b0cf..51f297e27d 100644 --- a/modules/agendadulibre/pages.py +++ b/modules/agendadulibre/pages.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2.page import HTMLPage, method, pagination -from weboob.tools.browser2.elements import ItemElement, ListElement -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 weboob.browser2.page import HTMLPage, method, pagination +from weboob.browser2.elements import ItemElement, ListElement +from weboob.browser2.filters.standard import Regexp, CleanText, DateTime, Filter, Type, Env, Format, CombineDate +from weboob.browser2.filters.html import Link, XPath, CleanHTML from .calendar import AgendaDuLibreCalendarEvent from datetime import time, datetime, date diff --git a/modules/alloresto/browser.py b/modules/alloresto/browser.py index 8d714bd38b..c7d772f92c 100644 --- a/modules/alloresto/browser.py +++ b/modules/alloresto/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from weboob.tools.exceptions import BrowserIncorrectPassword from .pages import LoginPage, AccountsPage diff --git a/modules/alloresto/pages.py b/modules/alloresto/pages.py index fea5935d17..a8b74acbaa 100644 --- a/modules/alloresto/pages.py +++ b/modules/alloresto/pages.py @@ -21,9 +21,9 @@ import datetime 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.standard import CleanDecimal, CleanText, Filter, TableCell +from weboob.browser2.page import HTMLPage, LoggedPage, method +from weboob.browser2.elements import ItemElement +from weboob.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/browser.py b/modules/banqueaccord/browser.py index e51b406c03..757f4cd953 100644 --- a/modules/banqueaccord/browser.py +++ b/modules/banqueaccord/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import LoginBrowser, need_login, URL +from weboob.browser2 import LoginBrowser, need_login, URL from weboob.tools.exceptions import BrowserIncorrectPassword from .pages import LoginPage, IndexPage, AccountsPage, OperationsPage diff --git a/modules/banqueaccord/pages.py b/modules/banqueaccord/pages.py index 6a8adc611c..c6501c333a 100644 --- a/modules/banqueaccord/pages.py +++ b/modules/banqueaccord/pages.py @@ -24,10 +24,10 @@ 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.standard import CleanText, Regexp, CleanDecimal, Env -from weboob.tools.browser2.filters.html import Attr +from weboob.browser2.page import HTMLPage, method, LoggedPage +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import CleanText, Regexp, CleanDecimal, Env +from weboob.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/browser.py b/modules/biplan/browser.py index 466cc13e73..5c7903969b 100644 --- a/modules/biplan/browser.py +++ b/modules/biplan/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import ProgramPage, EventPage diff --git a/modules/biplan/pages.py b/modules/biplan/pages.py index bb32512780..4732769d46 100644 --- a/modules/biplan/pages.py +++ b/modules/biplan/pages.py @@ -23,10 +23,10 @@ import weboob.tools.date as date_util 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.standard import Filter, CleanText, Env, Regexp, CombineDate -from weboob.tools.browser2.filters.html import Link, CleanHTML +from weboob.browser2.elements import ItemElement, SkipItem, ListElement +from weboob.browser2.page import HTMLPage, method +from weboob.browser2.filters.standard import Filter, CleanText, Env, Regexp, CombineDate +from weboob.browser2.filters.html import Link, CleanHTML class BiplanPrice(Filter): diff --git a/modules/carrefourbanque/browser.py b/modules/carrefourbanque/browser.py index 2f737e9e2d..7a1c62f733 100644 --- a/modules/carrefourbanque/browser.py +++ b/modules/carrefourbanque/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from weboob.tools.exceptions import BrowserIncorrectPassword from .pages import LoginPage, HomePage, TransactionsPage diff --git a/modules/carrefourbanque/pages.py b/modules/carrefourbanque/pages.py index 8e270278cc..f289812337 100644 --- a/modules/carrefourbanque/pages.py +++ b/modules/carrefourbanque/pages.py @@ -20,10 +20,10 @@ import re -from weboob.tools.browser2.page import HTMLPage, method, LoggedPage -from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters.standard import Regexp, CleanText, CleanDecimal, Format -from weboob.tools.browser2.filters.html import Link +from weboob.browser2.page import HTMLPage, method, LoggedPage +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import Regexp, CleanText, CleanDecimal, Format +from weboob.browser2.filters.html import Link from weboob.capabilities.bank import Account from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/modules/cci/browser.py b/modules/cci/browser.py index 606870058a..9f8de9f156 100644 --- a/modules/cci/browser.py +++ b/modules/cci/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from weboob.capabilities.job import BaseJobAdvert from .pages import SearchPage diff --git a/modules/cci/pages.py b/modules/cci/pages.py index f7d0635694..3395e3b377 100644 --- a/modules/cci/pages.py +++ b/modules/cci/pages.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2.page import HTMLPage, method -from weboob.tools.browser2.elements import ItemElement, TableElement -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.browser2.page import HTMLPage, method +from weboob.browser2.elements import ItemElement, TableElement +from weboob.browser2.filters.standard import Filter, CleanText, Format, Env, DateTime, TableCell, Join +from weboob.browser2.filters.html import Link, CleanHTML from weboob.capabilities.job import BaseJobAdvert diff --git a/modules/cmb/module.py b/modules/cmb/module.py index 921303db3a..aa728de6fd 100644 --- a/modules/cmb/module.py +++ b/modules/cmb/module.py @@ -23,7 +23,7 @@ from weboob.tools.value import ValueBackendPassword from weboob.capabilities.base import NotAvailable from weboob.tools.exceptions import BrowserIncorrectPassword, ParseError -from weboob.tools.browser2 import Browser +from weboob.browser2 import Browser from re import match, compile, sub from decimal import Decimal diff --git a/modules/creditmutuel/browser.py b/modules/creditmutuel/browser.py index 11c3362b0c..d1f9a4ffd1 100644 --- a/modules/creditmutuel/browser.py +++ b/modules/creditmutuel/browser.py @@ -26,7 +26,7 @@ from datetime import datetime, timedelta from weboob.tools.compat import basestring -from weboob.tools.browser2 import LoginBrowser, URL, Wget, need_login +from weboob.browser2 import LoginBrowser, URL, Wget, need_login from weboob.tools.exceptions import BrowserIncorrectPassword from weboob.capabilities.bank import Transfer, TransferError diff --git a/modules/creditmutuel/pages.py b/modules/creditmutuel/pages.py index ed4a4d492b..8b7173d7cb 100644 --- a/modules/creditmutuel/pages.py +++ b/modules/creditmutuel/pages.py @@ -27,10 +27,10 @@ import re 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.standard import Filter, Env, CleanText, CleanDecimal, Field, TableCell -from weboob.tools.browser2.filters.html import Link +from weboob.browser2.page import HTMLPage, method, FormNotFound, LoggedPage +from weboob.browser2.elements import ListElement, ItemElement, SkipItem +from weboob.browser2.filters.standard import Filter, Env, CleanText, CleanDecimal, Field, TableCell +from weboob.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/browser.py b/modules/dresdenwetter/browser.py index e17b46d546..4742739c14 100644 --- a/modules/dresdenwetter/browser.py +++ b/modules/dresdenwetter/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import StartPage diff --git a/modules/dresdenwetter/pages.py b/modules/dresdenwetter/pages.py index 0838f3b974..3c8595114d 100644 --- a/modules/dresdenwetter/pages.py +++ b/modules/dresdenwetter/pages.py @@ -17,9 +17,9 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2.page import HTMLPage, method -from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters.standard import CleanText, Regexp, Field, Filter, debug +from weboob.browser2.page import HTMLPage, method +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import CleanText, Regexp, Field, Filter, debug from weboob.capabilities.gauge import GaugeMeasure, GaugeSensor from weboob.capabilities.base import NotAvailable diff --git a/modules/feedly/browser.py b/modules/feedly/browser.py index 88dd7dc67b..cf8e4969ae 100644 --- a/modules/feedly/browser.py +++ b/modules/feedly/browser.py @@ -19,7 +19,7 @@ from weboob.tools.json import json from weboob.capabilities.collection import Collection -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from .pages import EssentialsPage, TokenPage, ContentsPage, PreferencesPage diff --git a/modules/feedly/google.py b/modules/feedly/google.py index 295d036d7d..d8638d3b98 100644 --- a/modules/feedly/google.py +++ b/modules/feedly/google.py @@ -19,7 +19,7 @@ from urlparse import urlparse, parse_qs -from weboob.tools.browser2 import LoginBrowser, URL, HTMLPage +from weboob.browser2 import LoginBrowser, URL, HTMLPage from weboob.tools.exceptions import BrowserIncorrectPassword diff --git a/modules/feedly/pages.py b/modules/feedly/pages.py index 3aa2fe825a..10ca4f288e 100644 --- a/modules/feedly/pages.py +++ b/modules/feedly/pages.py @@ -21,11 +21,11 @@ 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.standard import CleanText, Format -from weboob.tools.browser2.filters.json import Dict -from weboob.tools.browser2.filters.html import CleanHTML +from weboob.browser2.page import JsonPage, method +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import CleanText, Format +from weboob.browser2.filters.json import Dict +from weboob.browser2.filters.html import CleanHTML class DictElement(ListElement): diff --git a/modules/francetelevisions/browser.py b/modules/francetelevisions/browser.py index 0910bbacbc..4ea6124b0c 100644 --- a/modules/francetelevisions/browser.py +++ b/modules/francetelevisions/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import IndexPage, VideoPage __all__ = ['PluzzBrowser'] diff --git a/modules/francetelevisions/pages.py b/modules/francetelevisions/pages.py index 3500a7bd66..e0921c7c1b 100644 --- a/modules/francetelevisions/pages.py +++ b/modules/francetelevisions/pages.py @@ -22,11 +22,11 @@ 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.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 +from weboob.browser2.page import HTMLPage, method, JsonPage +from weboob.browser2.elements import ItemElement, ListElement +from weboob.browser2.filters.standard import Filter, CleanText, Regexp, Format, DateTime, Env, Duration +from weboob.browser2.filters.html import Link, Attr, XPath +from weboob.browser2.filters.json import Dict class DurationPluzz(Filter): diff --git a/modules/freemobile/browser.py b/modules/freemobile/browser.py index aae84afcbd..003c0aed18 100644 --- a/modules/freemobile/browser.py +++ b/modules/freemobile/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from weboob.tools.exceptions import BrowserIncorrectPassword from .pages import HomePage, LoginPage, HistoryPage, DetailsPage diff --git a/modules/freemobile/pages/history.py b/modules/freemobile/pages/history.py index 5cb8d58c18..c6ea5f91d1 100644 --- a/modules/freemobile/pages/history.py +++ b/modules/freemobile/pages/history.py @@ -24,11 +24,11 @@ from datetime import datetime 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.standard import Date, CleanText, Filter,\ +from weboob.browser2.page import HTMLPage, method, LoggedPage +from weboob.browser2.elements import ItemElement, ListElement +from weboob.browser2.filters.standard import Date, CleanText, Filter,\ CleanDecimal, Regexp, Field, DateTime, Format, Env -from weboob.tools.browser2.filters.html import Attr +from weboob.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 9269b2bef8..0cf37e71fe 100644 --- a/modules/freemobile/pages/homepage.py +++ b/modules/freemobile/pages/homepage.py @@ -19,10 +19,10 @@ 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.standard import CleanText, Field, Format, Filter -from weboob.tools.browser2.filters.html import Attr +from weboob.browser2.page import method +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import CleanText, Field, Format, Filter +from weboob.browser2.filters.html import Attr class GetID(Filter): diff --git a/modules/freemobile/pages/login.py b/modules/freemobile/pages/login.py index 86048b10df..b8ac832571 100644 --- a/modules/freemobile/pages/login.py +++ b/modules/freemobile/pages/login.py @@ -22,7 +22,7 @@ from StringIO import StringIO from PIL import Image -from weboob.tools.browser2.page import HTMLPage +from weboob.browser2.page import HTMLPage class FreeKeyboard(object): diff --git a/modules/groupamaes/browser.py b/modules/groupamaes/browser.py index 45b8cdf2ca..b8d591054b 100644 --- a/modules/groupamaes/browser.py +++ b/modules/groupamaes/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from weboob.tools.exceptions import BrowserIncorrectPassword from .pages import LoginPage, LoginErrorPage, AvoirPage, OperationsTraiteesPage, OperationsFuturesPage diff --git a/modules/groupamaes/pages.py b/modules/groupamaes/pages.py index e8d2646d70..f6757bdef0 100644 --- a/modules/groupamaes/pages.py +++ b/modules/groupamaes/pages.py @@ -18,9 +18,9 @@ # along with weboob. If not, see . -from weboob.tools.browser2.page import HTMLPage, method, LoggedPage -from weboob.tools.browser2.elements import TableElement, ItemElement -from weboob.tools.browser2.filters.standard import CleanText, CleanDecimal, TableCell, Date +from weboob.browser2.page import HTMLPage, method, LoggedPage +from weboob.browser2.elements import TableElement, ItemElement +from weboob.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/browser.py b/modules/hsbc/browser.py index c844383980..8aaad18d97 100644 --- a/modules/hsbc/browser.py +++ b/modules/hsbc/browser.py @@ -23,7 +23,7 @@ from weboob.tools.date import LinearDateGuesser from weboob.tools.exceptions import BrowserIncorrectPassword -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from .pages import AccountsPage, CBOperationPage, CPTOperationPage, LoginPage diff --git a/modules/hsbc/pages.py b/modules/hsbc/pages.py index 0835ad4f85..6ca883636a 100644 --- a/modules/hsbc/pages.py +++ b/modules/hsbc/pages.py @@ -25,10 +25,10 @@ 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.standard import Filter, Env, CleanText, CleanDecimal, Field, DateGuesser, TableCell -from weboob.tools.browser2.filters.html import Link +from weboob.browser2.elements import ListElement, ItemElement, SkipItem +from weboob.browser2.page import HTMLPage, method, LoggedPage, pagination +from weboob.browser2.filters.standard import Filter, Env, CleanText, CleanDecimal, Field, DateGuesser, TableCell +from weboob.browser2.filters.html import Link class Transaction(FrenchTransaction): diff --git a/modules/hybride/browser.py b/modules/hybride/browser.py index 0a2ca8429f..fa86316a86 100644 --- a/modules/hybride/browser.py +++ b/modules/hybride/browser.py @@ -19,7 +19,7 @@ from .pages import ProgramPage, EventPage -from weboob.tools.browser2 import PagesBrowser, URL, Firefox +from weboob.browser2 import PagesBrowser, URL, Firefox __all__ = ['HybrideBrowser'] diff --git a/modules/hybride/pages.py b/modules/hybride/pages.py index a509041524..a290992bb1 100644 --- a/modules/hybride/pages.py +++ b/modules/hybride/pages.py @@ -23,10 +23,10 @@ import weboob.tools.date as date_util import re -from weboob.tools.browser2.page import HTMLPage, method -from weboob.tools.browser2.elements import ItemElement, SkipItem, ListElement -from weboob.tools.browser2.filters.standard import Filter, CleanText, Env -from weboob.tools.browser2.filters.html import Link +from weboob.browser2.page import HTMLPage, method +from weboob.browser2.elements import ItemElement, SkipItem, ListElement +from weboob.browser2.filters.standard import Filter, CleanText, Env +from weboob.browser2.filters.html import Link def format_date(date): diff --git a/modules/indeed/browser.py b/modules/indeed/browser.py index 09376e50ce..7934a2af61 100644 --- a/modules/indeed/browser.py +++ b/modules/indeed/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import SearchPage, AdvertPage diff --git a/modules/indeed/pages.py b/modules/indeed/pages.py index d1efcc7977..b5e7c1b7f9 100644 --- a/modules/indeed/pages.py +++ b/modules/indeed/pages.py @@ -19,10 +19,10 @@ 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.standard import Filter, CleanText, Regexp, Format, Env -from weboob.tools.browser2.filters.html import CleanHTML, Attr +from weboob.browser2.page import HTMLPage, method, pagination +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import Filter, CleanText, Regexp, Format, Env +from weboob.browser2.filters.html import CleanHTML, Attr from weboob.capabilities.job import BaseJobAdvert diff --git a/modules/ing/browser.py b/modules/ing/browser.py index 67266adffd..e034f6bc6d 100644 --- a/modules/ing/browser.py +++ b/modules/ing/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . import hashlib -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from weboob.tools.exceptions import BrowserIncorrectPassword, ParseError from weboob.capabilities.bank import Account, TransferError diff --git a/modules/ing/pages/accounts_list.py b/modules/ing/pages/accounts_list.py index cb54f53069..a1aca2d12d 100644 --- a/modules/ing/pages/accounts_list.py +++ b/modules/ing/pages/accounts_list.py @@ -24,10 +24,10 @@ 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.standard import CleanText, CleanDecimal, Filter, Field, MultiFilter, Date, Lower -from weboob.tools.browser2.filters.html import Attr +from weboob.browser2.page import HTMLPage, LoggedPage, method +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import CleanText, CleanDecimal, Filter, Field, MultiFilter, Date, Lower +from weboob.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 120cb9a7ae..26350dea18 100644 --- a/modules/ing/pages/bills.py +++ b/modules/ing/pages/bills.py @@ -18,11 +18,11 @@ # along with weboob. If not, see . from weboob.capabilities.bill import Bill, Subscription -from weboob.tools.browser2 import HTMLPage, LoggedPage -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 +from weboob.browser2 import HTMLPage, LoggedPage +from weboob.browser2.filters.standard import Filter, CleanText, Format, Field, Env +from weboob.browser2.filters.html import Attr +from weboob.browser2.page import method, pagination +from weboob.browser2.elements import ListElement, ItemElement class FormId(Filter): diff --git a/modules/ing/pages/login.py b/modules/ing/pages/login.py index efdd65d674..15e2132c9e 100644 --- a/modules/ing/pages/login.py +++ b/modules/ing/pages/login.py @@ -21,7 +21,7 @@ from weboob.tools.exceptions import BrowserIncorrectPassword from weboob.tools.captcha.virtkeyboard import VirtKeyboard -from weboob.tools.browser2.page import HTMLPage +from weboob.browser2.page import HTMLPage class INGVirtKeyboard(VirtKeyboard): diff --git a/modules/ing/pages/titre.py b/modules/ing/pages/titre.py index ee0c9231ac..8d54779057 100644 --- a/modules/ing/pages/titre.py +++ b/modules/ing/pages/titre.py @@ -21,9 +21,9 @@ 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.standard import CleanDecimal, CleanText, Date +from weboob.browser2.page import RawPage, HTMLPage, method, LoggedPage +from weboob.browser2.elements import ListElement, ItemElement +from weboob.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 64777af0ab..6b3f902489 100644 --- a/modules/ing/pages/transfer.py +++ b/modules/ing/pages/transfer.py @@ -18,10 +18,10 @@ # along with weboob. If not, see . 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.standard import CleanText, CleanDecimal, Format -from weboob.tools.browser2.filters.html import Attr +from weboob.browser2.page import HTMLPage, LoggedPage, method +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import CleanText, CleanDecimal, Format +from weboob.browser2.filters.html import Attr from .login import INGVirtKeyboard diff --git a/modules/leboncoin/browser.py b/modules/leboncoin/browser.py index 4cda37185b..28443a1703 100644 --- a/modules/leboncoin/browser.py +++ b/modules/leboncoin/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import CityListPage, HousingListPage, HousingPage diff --git a/modules/leboncoin/pages.py b/modules/leboncoin/pages.py index 6ccfecde4d..8246fcd81a 100644 --- a/modules/leboncoin/pages.py +++ b/modules/leboncoin/pages.py @@ -18,10 +18,10 @@ # along with weboob. If not, see . 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.standard import CleanText, Regexp, CleanDecimal, Env, DateTime -from weboob.tools.browser2.filters.html import Attr, Link +from weboob.browser2.page import HTMLPage, method, pagination +from weboob.browser2.elements import ItemElement, ListElement +from weboob.browser2.filters.standard import CleanText, Regexp, CleanDecimal, Env, DateTime +from weboob.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/browser.py b/modules/mareeinfo/browser.py index e476bbab56..a3ea820dab 100644 --- a/modules/mareeinfo/browser.py +++ b/modules/mareeinfo/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import IndexPage diff --git a/modules/mareeinfo/pages.py b/modules/mareeinfo/pages.py index 6431eb63da..a4bb8e64df 100644 --- a/modules/mareeinfo/pages.py +++ b/modules/mareeinfo/pages.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2.page import HTMLPage, method -from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters.standard import CleanText, DateTime, CleanDecimal, Regexp -from weboob.tools.browser2.filters.html import Link, XPath +from weboob.browser2.page import HTMLPage, method +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import CleanText, DateTime, CleanDecimal, Regexp +from weboob.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/browser.py b/modules/oney/browser.py index da53f1bc63..3f68bcc494 100644 --- a/modules/oney/browser.py +++ b/modules/oney/browser.py @@ -20,7 +20,7 @@ from weboob.capabilities.bank import Account from weboob.tools.exceptions import BrowserIncorrectPassword -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from .pages import LoginPage, IndexPage, OperationsPage diff --git a/modules/oney/pages.py b/modules/oney/pages.py index 1441496c4f..7be4b2b5de 100644 --- a/modules/oney/pages.py +++ b/modules/oney/pages.py @@ -25,9 +25,9 @@ from weboob.tools.capabilities.bank.transactions import FrenchTransaction from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard, VirtKeyboardError -from weboob.tools.browser2.page import HTMLPage, method, LoggedPage, pagination -from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters.standard import Env, CleanDecimal +from weboob.browser2.page import HTMLPage, method, LoggedPage, pagination +from weboob.browser2.elements import ListElement, ItemElement +from weboob.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 193fdeb5c7..8cf10382ee 100644 --- a/modules/pastealacon/browser.py +++ b/modules/pastealacon/browser.py @@ -20,9 +20,9 @@ import re from weboob.capabilities.paste import BasePaste, PasteNotFound -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.browser2.filters.standard import CleanText, DateTime, Env, RawText, Regexp +from weboob.browser2.page import HTMLPage, method, PagesBrowser, URL +from weboob.browser2.elements import ItemElement from weboob.tools.exceptions import BrowserHTTPNotFound diff --git a/modules/pastebin/browser.py b/modules/pastebin/browser.py index 11ea171e5e..57ffca9b0b 100644 --- a/modules/pastebin/browser.py +++ b/modules/pastebin/browser.py @@ -21,11 +21,11 @@ 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.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.browser2 import HTMLPage, LoginBrowser, need_login, URL +from weboob.browser2.elements import ItemElement +from weboob.browser2.filters.standard import Base, CleanText, DateTime, Env, Filter, FilterError, RawText +from weboob.browser2.filters.html import Attr +from weboob.browser2.page import method, RawPage from weboob.tools.exceptions import BrowserHTTPNotFound, BrowserIncorrectPassword, BrowserUnavailable diff --git a/modules/poivy/browser.py b/modules/poivy/browser.py index dac6146f2f..7b4c386a72 100644 --- a/modules/poivy/browser.py +++ b/modules/poivy/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from weboob.tools.exceptions import BrowserIncorrectPassword from .pages import HomePage, LoginPage, HistoryPage, BillsPage, ErrorPage diff --git a/modules/poivy/pages.py b/modules/poivy/pages.py index a16752f288..d6a869df10 100644 --- a/modules/poivy/pages.py +++ b/modules/poivy/pages.py @@ -18,10 +18,10 @@ # along with weboob. If not, see . 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.standard import CleanText, CleanDecimal, Field, DateTime, Format -from weboob.tools.browser2.filters.html import Attr, Link +from weboob.browser2.page import HTMLPage, LoggedPage, method, pagination +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import CleanText, CleanDecimal, Field, DateTime, Format +from weboob.browser2.filters.html import Attr, Link from weboob.capabilities.bill import Subscription, Detail diff --git a/modules/razibus/browser.py b/modules/razibus/browser.py index 404b92962e..7079e28282 100644 --- a/modules/razibus/browser.py +++ b/modules/razibus/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import EventListPage, EventPage diff --git a/modules/razibus/pages.py b/modules/razibus/pages.py index f4b2d7ecdc..d63d8efd85 100644 --- a/modules/razibus/pages.py +++ b/modules/razibus/pages.py @@ -21,10 +21,10 @@ 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.html import CleanHTML, Link -from weboob.tools.browser2.filters.standard import Regexp, CleanText, DateTime, CombineDate, Filter, Env +from weboob.browser2.page import HTMLPage, method +from weboob.browser2.elements import ItemElement, ListElement +from weboob.browser2.filters.html import CleanHTML, Link +from weboob.browser2.filters.standard import Regexp, CleanText, DateTime, CombineDate, Filter, Env class EndTime(Filter): diff --git a/modules/regionsjob/browser.py b/modules/regionsjob/browser.py index 68c52162da..6813ee9dca 100644 --- a/modules/regionsjob/browser.py +++ b/modules/regionsjob/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . import urllib -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import SearchPage, AdvertPage diff --git a/modules/regionsjob/pages.py b/modules/regionsjob/pages.py index aac1b94f41..c99afcf8b7 100644 --- a/modules/regionsjob/pages.py +++ b/modules/regionsjob/pages.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2.page import HTMLPage, method -from weboob.tools.browser2.elements import ItemElement, SkipItem, ListElement -from weboob.tools.browser2.filters.standard import CleanText, Regexp, Format, Env, DateGuesser, DateTime -from weboob.tools.browser2.filters.html import Link, CleanHTML +from weboob.browser2.page import HTMLPage, method +from weboob.browser2.elements import ItemElement, SkipItem, ListElement +from weboob.browser2.filters.standard import CleanText, Regexp, Format, Env, DateGuesser, DateTime +from weboob.browser2.filters.html import Link, CleanHTML from weboob.tools.date import LinearDateGuesser from weboob.capabilities.job import BaseJobAdvert diff --git a/modules/sachsen/browser.py b/modules/sachsen/browser.py index ce0cdfeca7..b087c5ad65 100644 --- a/modules/sachsen/browser.py +++ b/modules/sachsen/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import ListPage, HistoryPage diff --git a/modules/sachsen/pages.py b/modules/sachsen/pages.py index 43c468ae6d..8f581dd45f 100644 --- a/modules/sachsen/pages.py +++ b/modules/sachsen/pages.py @@ -17,10 +17,10 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2.page import HTMLPage, method -from weboob.tools.browser2.elements import ListElement, ItemElement -from weboob.tools.browser2.filters.standard import Env, CleanText, Regexp, Field, DateTime, Map -from weboob.tools.browser2.filters.html import Attr +from weboob.browser2.page import HTMLPage, method +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import Env, CleanText, Regexp, Field, DateTime, Map +from weboob.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/browser.py b/modules/senscritique/browser.py index e86f2579b5..d158799a63 100644 --- a/modules/senscritique/browser.py +++ b/modules/senscritique/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL, Firefox +from weboob.browser2 import PagesBrowser, URL, Firefox from .calendar import SensCritiquenCalendarEvent from .pages import AjaxPage, EventPage, JsonResumePage diff --git a/modules/senscritique/pages.py b/modules/senscritique/pages.py index 3b9828a6ff..001497c4d7 100644 --- a/modules/senscritique/pages.py +++ b/modules/senscritique/pages.py @@ -22,10 +22,10 @@ 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.standard import Filter, CleanText, Regexp, Join, Format -from weboob.tools.browser2.filters.html import Link, Attr +from weboob.browser2.page import HTMLPage, method, JsonPage +from weboob.browser2.elements import ItemElement, ListElement +from weboob.browser2.filters.standard import Filter, CleanText, Regexp, Join, Format +from weboob.browser2.filters.html import Link, Attr class Channel(Filter): diff --git a/modules/tinder/browser.py b/modules/tinder/browser.py index fd74c361c3..5b4f2fed35 100644 --- a/modules/tinder/browser.py +++ b/modules/tinder/browser.py @@ -20,7 +20,7 @@ import re -from weboob.tools.browser2 import DomainBrowser, HTMLPage, Profile +from weboob.browser2 import DomainBrowser, HTMLPage, Profile from weboob.tools.exceptions import BrowserIncorrectPassword from weboob.tools.json import json diff --git a/modules/transilien/browser.py b/modules/transilien/browser.py index a9133c6493..97ba0f2421 100644 --- a/modules/transilien/browser.py +++ b/modules/transilien/browser.py @@ -19,7 +19,7 @@ # along with weboob. If not, see . from datetime import datetime -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import StationsPage, DeparturesPage, DeparturesPage2, HorairesPage, RoadMapPage diff --git a/modules/transilien/pages.py b/modules/transilien/pages.py index af7e8af2a5..064731b8ee 100644 --- a/modules/transilien/pages.py +++ b/modules/transilien/pages.py @@ -20,12 +20,12 @@ import re -from weboob.tools.browser2.page import JsonPage, HTMLPage, method -from weboob.tools.browser2.elements import TableElement, ItemElement, ListElement +from weboob.browser2.page import JsonPage, HTMLPage, method +from weboob.browser2.elements import TableElement, ItemElement, ListElement from weboob.capabilities.travel import Station, Departure, RoadStep -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.browser2.filters.standard import CleanText, TableCell, Filter, DateTime, Env, Regexp, Duration +from weboob.browser2.filters.json import Dict +from weboob.browser2.filters.html import Link from weboob.tools.date import LinearDateGuesser diff --git a/modules/twitter/browser.py b/modules/twitter/browser.py index ca58c3e1a0..9afbf2d2bc 100644 --- a/modules/twitter/browser.py +++ b/modules/twitter/browser.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from weboob.tools.browser import BrowserIncorrectPassword from weboob.capabilities.messages import Message from .pages import LoginPage, LoginErrorPage, ThreadPage, Tweet, TrendsPage,\ diff --git a/modules/twitter/pages.py b/modules/twitter/pages.py index 55c804776e..9153ebc0ad 100644 --- a/modules/twitter/pages.py +++ b/modules/twitter/pages.py @@ -23,10 +23,10 @@ import lxml.html as html 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.standard import CleanText, Format, Regexp, Env, DateTime, Filter -from weboob.tools.browser2.filters.html import Link, Attr +from weboob.browser2.page import HTMLPage, JsonPage, method, FormNotFound, pagination +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import CleanText, Format, Regexp, Env, DateTime, Filter +from weboob.browser2.filters.html import Link, Attr from weboob.capabilities.messages import Thread, Message from weboob.capabilities.base import BaseObject diff --git a/modules/vimeo/browser.py b/modules/vimeo/browser.py index 7a20fe4400..c87ff0ee45 100644 --- a/modules/vimeo/browser.py +++ b/modules/vimeo/browser.py @@ -18,8 +18,8 @@ # You should have received a copy of the GNU Affero General Public License # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL -from weboob.tools.browser2.exceptions import HTTPNotFound +from weboob.browser2 import PagesBrowser, URL +from weboob.browser2.exceptions import HTTPNotFound from .pages import SearchPage, VideoPage, VideoJsonPage import urllib diff --git a/modules/vimeo/pages.py b/modules/vimeo/pages.py index 9d02a0304a..6e9c817363 100644 --- a/modules/vimeo/pages.py +++ b/modules/vimeo/pages.py @@ -21,10 +21,10 @@ 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.standard import Regexp, Env, CleanText, DateTime, Duration, Field -from weboob.tools.browser2.filters.html import Attr, Link +from weboob.browser2.elements import ItemElement, ListElement +from weboob.browser2.page import HTMLPage, method, pagination, JsonPage +from weboob.browser2.filters.standard import Regexp, Env, CleanText, DateTime, Duration, Field +from weboob.browser2.filters.html import Attr, Link import re diff --git a/modules/vlille/browser.py b/modules/vlille/browser.py index 13a58dd74b..8acb880a4d 100644 --- a/modules/vlille/browser.py +++ b/modules/vlille/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import ListStationsPage, InfoStationPage diff --git a/modules/vlille/pages.py b/modules/vlille/pages.py index 3ef4a6fc8b..d6fd100e49 100644 --- a/modules/vlille/pages.py +++ b/modules/vlille/pages.py @@ -18,9 +18,9 @@ # along with weboob. If not, see . -from weboob.tools.browser2.page import HTMLPage, XMLPage, method -from weboob.tools.browser2.elements import ListElement, ItemElement, TableElement -from weboob.tools.browser2.filters.standard import CleanText, TableCell, Filter +from weboob.browser2.page import HTMLPage, XMLPage, method +from weboob.browser2.elements import ListElement, ItemElement, TableElement +from weboob.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/wellsfargo/browser.py b/modules/wellsfargo/browser.py index d731579378..82f0e89ca7 100644 --- a/modules/wellsfargo/browser.py +++ b/modules/wellsfargo/browser.py @@ -21,7 +21,7 @@ from time import sleep from weboob.capabilities.bank import AccountNotFound -from weboob.tools.browser2 import LoginBrowser, URL, need_login +from weboob.browser2 import LoginBrowser, URL, need_login from weboob.tools.exceptions import BrowserIncorrectPassword from .pages import LoginPage, LoginRedirectPage, LoggedInPage, SummaryPage, \ diff --git a/modules/wellsfargo/pages.py b/modules/wellsfargo/pages.py index 1a889bb08a..45f2ff4a0b 100644 --- a/modules/wellsfargo/pages.py +++ b/modules/wellsfargo/pages.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.capabilities.bank import Account, Transaction -from weboob.tools.browser2.page import Page, HTMLPage, LoggedPage, RawPage +from weboob.browser2.page import Page, HTMLPage, LoggedPage, RawPage from urllib import unquote from .parsers import StatementParser, clean_amount, clean_label import itertools diff --git a/modules/youjizz/browser.py b/modules/youjizz/browser.py index 0d554330a3..b4e976dbc0 100644 --- a/modules/youjizz/browser.py +++ b/modules/youjizz/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages.index import IndexPage from .pages.video import VideoPage diff --git a/modules/youjizz/pages/index.py b/modules/youjizz/pages/index.py index 13ab7d562a..4e4517c174 100644 --- a/modules/youjizz/pages/index.py +++ b/modules/youjizz/pages/index.py @@ -18,11 +18,11 @@ # along with weboob. If not, see . -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.standard import CleanText, Duration, Regexp -from weboob.tools.browser2.filters.html import Link, CSS +from weboob.browser2 import HTMLPage +from weboob.browser2.page import method, pagination +from weboob.browser2.elements import ListElement, ItemElement +from weboob.browser2.filters.standard import CleanText, Duration, Regexp +from weboob.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 cc66eedf33..d69c8f52d2 100644 --- a/modules/youjizz/pages/video.py +++ b/modules/youjizz/pages/video.py @@ -20,9 +20,9 @@ import re -from weboob.tools.browser2.page import method, HTMLPage -from weboob.tools.browser2.elements import ItemElement -from weboob.tools.browser2.filters.standard import CleanText, Env, Duration +from weboob.browser2.page import method, HTMLPage +from weboob.browser2.elements import ItemElement +from weboob.browser2.filters.standard import CleanText, Env, Duration from weboob.capabilities.video import BaseVideo from weboob.tools.misc import to_unicode diff --git a/setup.cfg b/setup.cfg index 3083e4c91b..59fbd5dbc0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -9,7 +9,7 @@ tests = weboob.capabilities.bank, weboob.tools.application.formatters.json, weboob.tools.application.formatters.table, weboob.tools.path, - weboob.tools.browser2.filters.standard + weboob.browser2.filters.standard [isort] known_first_party=weboob diff --git a/tools/boilerplate_data/base_browser.py b/tools/boilerplate_data/base_browser.py index ea04ccc7b0..cc3db9ca98 100644 --- a/tools/boilerplate_data/base_browser.py +++ b/tools/boilerplate_data/base_browser.py @@ -1,5 +1,5 @@ <%inherit file="layout.py"/> -from weboob.tools.browser2 import PagesBrowser, URL +from weboob.browser2 import PagesBrowser, URL from .pages import Page1, Page2 diff --git a/tools/boilerplate_data/base_pages.py b/tools/boilerplate_data/base_pages.py index 4871172fa2..74b44c8be1 100644 --- a/tools/boilerplate_data/base_pages.py +++ b/tools/boilerplate_data/base_pages.py @@ -1,5 +1,5 @@ <%inherit file="layout.py"/> -from weboob.tools.browser2 import HTMLPage +from weboob.browser2 import HTMLPage class Page1(HTMLPage): diff --git a/weboob/tools/browser2/__init__.py b/weboob/browser2/__init__.py similarity index 100% rename from weboob/tools/browser2/__init__.py rename to weboob/browser2/__init__.py diff --git a/weboob/tools/browser2/browser.py b/weboob/browser2/browser.py similarity index 100% rename from weboob/tools/browser2/browser.py rename to weboob/browser2/browser.py diff --git a/weboob/tools/browser2/cookies.py b/weboob/browser2/cookies.py similarity index 100% rename from weboob/tools/browser2/cookies.py rename to weboob/browser2/cookies.py diff --git a/weboob/tools/browser2/elements.py b/weboob/browser2/elements.py similarity index 99% rename from weboob/tools/browser2/elements.py rename to weboob/browser2/elements.py index 7492976c95..c79ced8185 100644 --- a/weboob/tools/browser2/elements.py +++ b/weboob/browser2/elements.py @@ -23,7 +23,7 @@ from weboob.tools.log import getLogger from weboob.tools.ordereddict import OrderedDict -from weboob.tools.browser2.page import NextPage +from weboob.browser2.page import NextPage from .filters.standard import _Filter, CleanText from .filters.html import AttributeNotFound, XPathNotFound diff --git a/weboob/tools/browser2/exceptions.py b/weboob/browser2/exceptions.py similarity index 100% rename from weboob/tools/browser2/exceptions.py rename to weboob/browser2/exceptions.py diff --git a/weboob/tools/browser2/filters/__init__.py b/weboob/browser2/filters/__init__.py similarity index 100% rename from weboob/tools/browser2/filters/__init__.py rename to weboob/browser2/filters/__init__.py diff --git a/weboob/tools/browser2/filters/html.py b/weboob/browser2/filters/html.py similarity index 100% rename from weboob/tools/browser2/filters/html.py rename to weboob/browser2/filters/html.py diff --git a/weboob/tools/browser2/filters/javascript.py b/weboob/browser2/filters/javascript.py similarity index 98% rename from weboob/tools/browser2/filters/javascript.py rename to weboob/browser2/filters/javascript.py index 086399cddb..290afc9ded 100644 --- a/weboob/tools/browser2/filters/javascript.py +++ b/weboob/browser2/filters/javascript.py @@ -21,7 +21,7 @@ import re from ast import literal_eval -from weboob.tools.browser2.filters.standard import Filter, Regexp, RegexpError +from weboob.browser2.filters.standard import Filter, Regexp, RegexpError from weboob.tools.exceptions import ParseError diff --git a/weboob/tools/browser2/filters/json.py b/weboob/browser2/filters/json.py similarity index 100% rename from weboob/tools/browser2/filters/json.py rename to weboob/browser2/filters/json.py diff --git a/weboob/tools/browser2/filters/standard.py b/weboob/browser2/filters/standard.py similarity index 99% rename from weboob/tools/browser2/filters/standard.py rename to weboob/browser2/filters/standard.py index ca3cb25f73..f806c0c32e 100644 --- a/weboob/tools/browser2/filters/standard.py +++ b/weboob/browser2/filters/standard.py @@ -29,7 +29,7 @@ from weboob.capabilities.base import empty from weboob.tools.compat import basestring from weboob.tools.exceptions import ParseError -from weboob.tools.browser2 import URL +from weboob.browser2 import URL from weboob.tools.log import getLogger class NoDefault(object): @@ -251,7 +251,7 @@ class TableCell(_Filter): For example: >>> from weboob.capabilities.bank import Transaction - >>> from weboob.tools.browser2.elements import TableElement, ItemElement + >>> from weboob.browser2.elements import TableElement, ItemElement >>> class table(TableElement): ... head_xpath = '//table/thead/th' ... item_xpath = '//table/tbody/tr' diff --git a/weboob/tools/browser2/page.py b/weboob/browser2/page.py similarity index 99% rename from weboob/tools/browser2/page.py rename to weboob/browser2/page.py index dffd82e7c3..a51a50b141 100644 --- a/weboob/tools/browser2/page.py +++ b/weboob/browser2/page.py @@ -279,7 +279,7 @@ def __init__(self, *args, **kwargs): def open(self, *args, **kwargs): """ Same method than - :meth:`weboob.tools.browser2.browser.DomainBrowser.open`, but the + :meth:`weboob.browser2.browser.DomainBrowser.open`, but the response contains an attribute `page` if the url matches any :class:`URL` object. """ @@ -309,7 +309,7 @@ def internal_callback(response): def location(self, *args, **kwargs): """ Same method than - :meth:`weboob.tools.browser2.browser.Browser.location`, but if the + :meth:`weboob.browser2.browser.Browser.location`, but if the url matches any :class:`URL` object, an attribute `page` is added to response, and the attribute :attr:`PagesBrowser.page` is set. """ diff --git a/weboob/tools/browser2/sessions.py b/weboob/browser2/sessions.py similarity index 100% rename from weboob/tools/browser2/sessions.py rename to weboob/browser2/sessions.py diff --git a/weboob/core/repositories.py b/weboob/core/repositories.py index 70af64c6d2..c4d37f5e62 100644 --- a/weboob/core/repositories.py +++ b/weboob/core/repositories.py @@ -442,7 +442,7 @@ def __init__(self, workdir, datadir, version): self.load() def load_browser(self): - from weboob.tools.browser2.browser import Browser, Weboob as WeboobProfile + from weboob.browser2.browser import Browser, Weboob as WeboobProfile class WeboobBrowser(Browser): PROFILE = WeboobProfile(self.version) if self.browser is None: diff --git a/weboob/tools/capabilities/bank/transactions.py b/weboob/tools/capabilities/bank/transactions.py index af3e7dd752..1396f7266e 100644 --- a/weboob/tools/capabilities/bank/transactions.py +++ b/weboob/tools/capabilities/bank/transactions.py @@ -28,8 +28,8 @@ 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.standard import Filter, CleanText, CleanDecimal, TableCell +from weboob.browser2.elements import TableElement, ItemElement +from weboob.browser2.filters.standard import Filter, CleanText, CleanDecimal, TableCell __all__ = ['FrenchTransaction', 'AmericanTransaction'] -- GitLab