nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename things related to browsers

Browse source 
weboob.tools.browser -> weboob.deprecated.browser
weboob.tools.parsers -> weboob.deprecated.browser.parsers
weboob.tools.mech -> weboob.deprecated.mech
weboob.browser2 -> weboob.browser
weboob.core.exceptions -> weboob.exceptions

Also, the new tree for browser2 is:

weboob.browser: import weboob.browser.browsers.* and weboob.browser.url.*
weboob.browser.browsers: all browsers (including PagesBrowser and LoginBrowser)
weboob.browser.url: the URL class
weboob.browser.profiles: all Profile classes
weboob.browser.sessions: WeboobSession and FuturesSession
weboob.browser.cookies: that's a cookies thing
weboob.browser.pages: all Page and derivated classes, and Form class
weboob.browser.exceptions: specific browser exceptions
weboob.browser.elements: AbstractElement classes, and 'method' decorator
weboob.browser.filters.*: all filters
This commit is contained in:
Romain Bignon 2014-10-07 00:23:18 +02:00
commit d61e15cf84
396 changed files with 1442 additions and 1382 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contrib/boobot.py
View file

@ -38,7 +38,7 @@ from mechanize import _headersutil as headersutil
from mechanize._html import EncodingFinder
from weboob.core import Weboob
from weboob.tools.browser import StandardBrowser, BrowserUnavailable
from weboob.deprecated.browser import StandardBrowser, BrowserUnavailable
from weboob.tools.misc import get_backtrace
from weboob.tools.misc import to_unicode
from weboob.tools.storage import StandardStorage

41
docs/source/guides/module.rst
View file

@ -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 <weboob.tools.backend.Module>` class.
* **module.py** - defines the main class of your module, which derives :class:`Module <weboob.tools.backend.Module>`.
* **browser.py** - your browser, derived from :class:`Browser <weboob.browser2.browser.Browser>`, is called by your module to interact with the supported website.
* **browser.py** - your browser, derived from :class:`Browser <weboob.browser.browsers.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 <weboob.browser2.page.PagesBrowser>` or
:class:`LoginBrowser <weboob.browser2.page.LoginBrowser>` (for authenticated websites) to interact with a website.
Most of modules use a class derived from :class:`PagesBrowser <weboob.browser.browsers.PagesBrowser>` or
:class:`LoginBrowser <weboob.browser.browsers.LoginBrowser>` (for authenticated websites) to interact with a website.
Edit ``browser.py``::
# -*- coding: utf-8 -*-
from weboob.browser2 import PagesBrowser
from weboob.browser 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() <weboob.browser2.page.PagesBrowser.open>` or :class:`location() <weboob.browser2.page.PagesBrowser.location>`
* **BASEURL** - base url of website used for absolute paths given to :class:`open() <weboob.browser.browsers.PagesBrowser.open>` or :class:`location() <weboob.browser.browsers.PagesBrowser.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,16 @@ Pages
For each page you want to handle, you have to create an associated class derived from one of these classes:
* :class:`HTMLPage <weboob.browser2.page.HTMLPage>` - a HTML page
* :class:`XMLPage <weboob.browser2.page.XMLPage>` - a XML document
* :class:`JsonPage <weboob.browser2.page.JsonPage>` - a Json object
* :class:`HTMLPage <weboob.browser.pages.HTMLPage>` - a HTML page
* :class:`XMLPage <weboob.browser.pages.XMLPage>` - a XML document
* :class:`JsonPage <weboob.browser.pages.JsonPage>` - a Json object
* :class:`CsvPage <weboob.browser.pages.CsvPage>` - a CSV table
In the file ``pages.py``, you can write, for example::
# -*- coding: utf-8 -*-
from weboob.browser2.page import HTMLPage
from weboob.browser.pages import HTMLPage
__all__ = ['IndexPage', 'ListPage']
@ -227,9 +228,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 <weboob.browser2.page.URL>` object::
Then, you have to declare them in your browser, with the :class:`URL <weboob.browser.url.URL>` object::
from weboob.browser2.page import PagesBrowser, URL
from weboob.browser import PagesBrowser, URL
from .pages import IndexPage, ListPage
# ...
@ -257,9 +258,9 @@ For example, we can now implement some methods in ``ExampleBrowser``::
return self.page.iter_accounts()
When calling the :func:`go() <weboob.browser2.page.URL.go>` method, it reads the first regexp url of our :class:`URL <weboob.browser2.page.URL>` object, and go on the page.
When calling the :func:`go() <weboob.browser.url.URL.go>` method, it reads the first regexp url of our :class:`URL <weboob.browser.url.URL>` object, and go on the page.
:func:`stay_or_go() <weboob.browser2.page.URL.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() <weboob.browser.url.URL.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 +296,8 @@ the method :func:`create_default_browser <weboob.tools.backend.Module.create_def
def create_default_browser(self):
return self.create_browser(self.config['username'].get(), self.config['password'].get())
On the browser side, you need to inherit from :func:`LoginBrowser <weboob.browser2.page.LoginBrowser>` and to implement the function
:func:`do_login <weboob.browser2.page.LoginBrowser.do_login>`::
On the browser side, you need to inherit from :func:`LoginBrowser <weboob.browser.browsers.LoginBrowser>` and to implement the function
:func:`do_login <weboob.browser.browsers.LoginBrowser.do_login>`::
class ExampleBrowser(LoginBrowser):
login = URL('/login', LoginPage)
@ -319,7 +320,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 <weboob.browser2.page.need_login>`::
Then, each method on your browser which need your user to be authenticated may be decorated by :func:`need_login <weboob.browser.browsers.need_login>`::
class ExampleBrowser(LoginBrowser):
accounts = URL('/accounts$', ListPage)
@ -329,9 +330,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 <weboob.browser2.page.need_login>` checks if the current page is a logged one by
reading the attribute :func:`logged <weboob.browser2.page.Page.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 <weboob.browser2.page.LoggedPage>`.
The last thing to know is that :func:`need_login <weboob.browser.browsers.need_login>` checks if the current page is a logged one by
reading the attribute :func:`logged <weboob.browser.pages.Page.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 <weboob.browser.pages.LoggedPage>`.
Parsing of pages
@ -342,7 +343,7 @@ Parsing of pages
When your browser locates on a page, an instance of the class related to the
:class:`URL <weboob.browser2.page.URL>` attribute which matches the url
:class:`URL <weboob.browser.url.URL>` attribute which matches the url
is created. You can declare methods on your class to allow your browser to
interact with it.

2
modules/750g/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserHTTPNotFound
from weboob.deprecated.browser import Browser, BrowserHTTPNotFound
from .pages import RecipePage, ResultsPage

2
modules/750g/pages.py
View file

@ -20,7 +20,7 @@
from weboob.capabilities.recipe import Recipe, Comment
from weboob.capabilities.base import NotAvailable, NotLoaded
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
class ResultsPage(Page):

4
modules/adecco/browser.py
View file

@ -17,8 +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.browser.decorators import id2url
from weboob.tools.browser import Browser
from weboob.deprecated.browser.decorators import id2url
from weboob.deprecated.browser import Browser
from .job import AdeccoJobAdvert
from .pages import SearchPage, AdvertPage
import urllib

2
modules/adecco/pages.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.html import html2text
from .job import AdeccoJobAdvert
import datetime

2
modules/agendadulibre/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.browser2 import PagesBrowser, URL
from weboob.browser import PagesBrowser, URL
from .pages import EventListPage, EventPage
from datetime import timedelta, date

8
modules/agendadulibre/pages.py
View file

@ -17,10 +17,10 @@
# 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.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 weboob.browser.pages import HTMLPage, pagination
from weboob.browser.elements import ItemElement, ListElement, method
from weboob.browser.filters.standard import Regexp, CleanText, DateTime, Filter, Type, Env, Format, CombineDate
from weboob.browser.filters.html import Link, XPath, CleanHTML
from .calendar import AgendaDuLibreCalendarEvent
from datetime import time, datetime, date

2
modules/allocine/browser.py
View file

@ -20,7 +20,7 @@
from weboob.capabilities.base import NotAvailable, NotLoaded
from weboob.capabilities.cinema import Movie, Person
from weboob.tools.browser import Browser
from weboob.deprecated.browser import Browser
from weboob.tools.json import json
import base64
import hashlib

4
modules/alloresto/browser.py
View file

@ -18,8 +18,8 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.browser2 import LoginBrowser, URL, need_login
from weboob.core.exceptions import BrowserIncorrectPassword
from weboob.browser import LoginBrowser, URL, need_login
from weboob.exceptions import BrowserIncorrectPassword
from .pages import LoginPage, AccountsPage

6
modules/alloresto/pages.py
View file

@ -21,9 +21,9 @@
import datetime
from decimal import Decimal
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.browser.pages import HTMLPage, LoggedPage
from weboob.browser.elements import ItemElement, method
from weboob.browser.filters.standard import CleanDecimal, CleanText, Filter, TableCell
from weboob.capabilities.bank import Account
from weboob.tools.capabilities.bank.transactions import FrenchTransaction as Transaction

2
modules/allrecipes/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserHTTPNotFound
from weboob.deprecated.browser import Browser, BrowserHTTPNotFound
from .pages import RecipePage, ResultsPage, FourOFourPage

2
modules/allrecipes/pages.py
View file

@ -20,7 +20,7 @@
from weboob.capabilities.recipe import Recipe
from weboob.capabilities.base import NotAvailable, NotLoaded
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
class FourOFourPage(Page):

2
modules/ameli/browser.py
View file

@ -17,7 +17,7 @@
# 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.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from weboob.capabilities.bill import Detail
from decimal import Decimal
from .pages import LoginPage, HomePage, AccountPage, LastPaymentsPage, PaymentDetailsPage, BillsPage

2
modules/ameli/pages.py
View file

@ -22,7 +22,7 @@ from datetime import datetime
import re
import urllib
from decimal import Decimal
from weboob.tools.browser import Page, BrokenPageError
from weboob.deprecated.browser import Page, BrokenPageError
from weboob.capabilities.bill import Subscription, Detail, Bill

2
modules/amelipro/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
import urllib
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from weboob.capabilities.bill import Detail
from decimal import Decimal
from .pages import LoginPage, HomePage, AccountPage, HistoryPage, BillsPage

2
modules/amelipro/pages.py
View file

@ -22,7 +22,7 @@ from datetime import datetime
from decimal import Decimal
import re
import urllib
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.capabilities.bill import Subscription, Detail, Bill

2
modules/americanexpress/browser.py
View file

@ -20,7 +20,7 @@
from urlparse import urlsplit, parse_qsl
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, AccountsPage, TransactionsPage

2
modules/americanexpress/pages.py
View file

@ -22,7 +22,7 @@ import datetime
from decimal import Decimal
import re
from weboob.tools.browser import Page, BrokenPageError
from weboob.deprecated.browser import Page, BrokenPageError
from weboob.capabilities.bank import Account
from weboob.capabilities import NotAvailable
from weboob.tools.capabilities.bank.transactions import FrenchTransaction as Transaction

4
modules/apec/browser.py
View file

@ -17,8 +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.browser.decorators import id2url
from weboob.tools.browser import Browser
from weboob.deprecated.browser.decorators import id2url
from weboob.deprecated.browser import Browser
import urllib
from .pages import SearchPage, AdvertPage
from .job import ApecJobAdvert

2
modules/apec/pages.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.html import html2text
import dateutil.parser
import re

2
modules/apivie/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, AccountsPage, OperationsPage

2
modules/apivie/pages.py
View file

@ -21,7 +21,7 @@
from decimal import Decimal
from weboob.capabilities.bank import Account
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

4
modules/arretsurimages/browser.py
View file

@ -18,8 +18,8 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.tools.browser.decorators import id2url
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser.decorators import id2url
from .pages import VideoPage, IndexPage, LoginPage, LoginRedirectPage
from .video import ArretSurImagesVideo

2
modules/arretsurimages/pages.py
View file

@ -21,7 +21,7 @@ import re
from weboob.capabilities.base import UserError
from weboob.capabilities.image import BaseImage
from weboob.tools.browser import Page, BrokenPageError
from weboob.deprecated.browser import Page, BrokenPageError
from weboob.capabilities import NotAvailable

4
modules/arte/browser.py
View file

@ -25,8 +25,8 @@ import urllib
from weboob.capabilities import NotAvailable
from weboob.capabilities.image import BaseImage
from weboob.tools.json import json as simplejson
from weboob.tools.browser import Browser
from weboob.tools.browser.decorators import id2url
from weboob.deprecated.browser import Browser
from weboob.deprecated.browser.decorators import id2url
from .pages import ArteLivePage, ArteLiveVideoPage
from .video import ArteVideo, ArteLiveVideo

2
modules/arte/pages.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.html import html2text
from weboob.capabilities import NotAvailable
from weboob.capabilities.image import BaseImage

2
modules/attilasub/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserHTTPNotFound
from weboob.deprecated.browser import Browser, BrowserHTTPNotFound
from .pages import SubtitlesPage, SearchPage

2
modules/attilasub/pages.py
View file

@ -20,7 +20,7 @@
from weboob.capabilities.subtitle import Subtitle
from weboob.capabilities.base import NotAvailable
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
class SearchPage(Page):

2
modules/audioaddict/module.py
View file

@ -24,7 +24,7 @@ from weboob.tools.capabilities.streaminfo import StreamInfo
from weboob.capabilities.collection import CapCollection, Collection
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import Value
from weboob.tools.browser import StandardBrowser
from weboob.deprecated.browser import StandardBrowser
import time
__all__ = ['AudioAddictModule']

7
modules/aum/browser.py
View file

@ -26,9 +26,10 @@ import re
import urllib
import urllib2
from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrowserHTTPNotFound, BrowserUnavailable
from weboob.browser2.page import LoginBrowser, HTMLPage
from weboob.browser2.filters.standard import CleanText
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword, BrowserHTTPNotFound, BrowserUnavailable
from weboob.browser.browsers import LoginBrowser
from weboob.browser.pages import HTMLPage
from weboob.browser.filters.standard import CleanText
from weboob.tools.json import json
from weboob.tools.date import local2utc
from weboob.tools.misc import to_unicode

2
modules/aum/module.py
View file

@ -31,7 +31,7 @@ from weboob.capabilities.dating import CapDating, OptimizationNotFound, Event
from weboob.capabilities.contact import CapContact, ContactPhoto, Query, QueryError
from weboob.capabilities.account import CapAccount, StatusField
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.browser import BrowserUnavailable, BrowserHTTPNotFound
from weboob.deprecated.browser import BrowserUnavailable, BrowserHTTPNotFound
from weboob.tools.value import Value, ValueBool, ValueBackendPassword
from weboob.tools.date import local2utc
from weboob.tools.misc import to_unicode

2
modules/aum/optim/profiles_walker.py
View file

@ -19,7 +19,7 @@
from random import randint
from weboob.tools.browser import BrowserUnavailable
from weboob.deprecated.browser import BrowserUnavailable
from weboob.capabilities.dating import Optimization
from weboob.tools.log import getLogger

2
modules/aum/optim/queries_queue.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import BrowserUnavailable
from weboob.deprecated.browser import BrowserUnavailable
from weboob.capabilities.dating import Optimization
from weboob.capabilities.contact import QueryError
from weboob.tools.log import getLogger

2
modules/aum/optim/visibility.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import BrowserUnavailable
from weboob.deprecated.browser import BrowserUnavailable
from weboob.capabilities.dating import Optimization

2
modules/aum/test.py
View file

@ -19,7 +19,7 @@
from weboob.tools.test import BackendTest
from weboob.tools.browser import BrowserUnavailable
from weboob.deprecated.browser import BrowserUnavailable
class AuMTest(BackendTest):

2
modules/axabanque/browser.py
View file

@ -20,7 +20,7 @@
import urllib
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, AccountsPage, TransactionsPage, CBTransactionsPage, UnavailablePage

2
modules/axabanque/pages.py
View file

@ -22,7 +22,7 @@ import urllib
from decimal import Decimal, InvalidOperation
import re
from weboob.tools.browser import Page as _BasePage, BrowserUnavailable, BrokenPageError
from weboob.deprecated.browser import Page as _BasePage, BrowserUnavailable, BrokenPageError
from weboob.capabilities.bank import Account
from weboob.tools.capabilities.bank.transactions import FrenchTransaction
from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard

4
modules/banqueaccord/browser.py
View file

@ -18,8 +18,8 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.browser2 import LoginBrowser, need_login, URL
from weboob.core.exceptions import BrowserIncorrectPassword
from weboob.browser import LoginBrowser, need_login, URL
from weboob.exceptions import BrowserIncorrectPassword
from .pages import LoginPage, IndexPage, AccountsPage, OperationsPage

10
modules/banqueaccord/pages.py
View file

@ -24,13 +24,13 @@ import re
from cStringIO import StringIO
from weboob.capabilities.bank import Account
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.browser.pages import HTMLPage, LoggedPage
from weboob.browser.elements import ListElement, ItemElement, method
from weboob.browser.filters.standard import CleanText, Regexp, CleanDecimal, Env
from weboob.browser.filters.html import Attr
from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard, VirtKeyboardError
from weboob.tools.capabilities.bank.transactions import FrenchTransaction
from weboob.core.exceptions import ParseError
from weboob.exceptions import ParseError
class Transaction(FrenchTransaction):

2
modules/banquepopulaire/browser.py
View file

@ -20,7 +20,7 @@
import urllib
from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrokenPageError
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword, BrokenPageError
from .pages import LoginPage, IndexPage, AccountsPage, CardsPage, TransactionsPage, \
UnavailablePage, RedirectPage, HomePage

2
modules/banquepopulaire/pages.py
View file

@ -24,7 +24,7 @@ from decimal import Decimal
import re
from mechanize import Cookie, FormNotFoundError
from weboob.tools.browser import Page as _BasePage, BrowserUnavailable, BrokenPageError
from weboob.deprecated.browser import Page as _BasePage, BrowserUnavailable, BrokenPageError
from weboob.capabilities.bank import Account
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

2
modules/barclays/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, Login2Page, IndexPage, AccountsPage, TransactionsPage, \
CardPage, ValuationPage, LoanPage, MarketPage

2
modules/barclays/pages.py
View file

@ -22,7 +22,7 @@ import datetime
from decimal import Decimal
import re
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.capabilities.bank import Account
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

2
modules/biplan/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.browser2 import PagesBrowser, URL
from weboob.browser import PagesBrowser, URL
from .pages import ProgramPage, EventPage

8
modules/biplan/pages.py
View file

@ -23,10 +23,10 @@ from datetime import datetime, time
import weboob.tools.date as date_util
from .calendar import BiplanCalendarEventConcert, BiplanCalendarEventTheatre
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
from weboob.browser.elements import ItemElement, SkipItem, ListElement, method
from weboob.browser.pages import HTMLPage
from weboob.browser.filters.standard import Filter, CleanText, Env, Regexp, CombineDate
from weboob.browser.filters.html import Link, CleanHTML
class BiplanPrice(Filter):

2
modules/bnporc/browser.py
View file

@ -22,7 +22,7 @@ import urllib
from datetime import datetime
from logging import warning
from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrowserPasswordExpired
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword, BrowserPasswordExpired
from weboob.capabilities.bank import TransferError, Transfer
from .perso.accounts_list import AccountsList, AccountPrelevement

2
modules/bnporc/enterprise/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, AccountsPage, HistoryPage, UnknownPage

2
modules/bnporc/enterprise/pages.py
View file

@ -24,7 +24,7 @@ from datetime import datetime
import re
from weboob.capabilities.bank import Account
from weboob.tools.browser import Page, BrokenPageError
from weboob.deprecated.browser import Page, BrokenPageError
from weboob.tools.capabilities.bank.transactions import FrenchTransaction
from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard, VirtKeyboardError
from weboob.tools.misc import to_unicode

2
modules/bnporc/perso/accounts_list.py
View file

@ -24,7 +24,7 @@ from decimal import Decimal
from weboob.tools.capabilities.bank.transactions import FrenchTransaction
from weboob.capabilities.bank import Account
from weboob.capabilities.base import NotAvailable
from weboob.tools.browser import Page, BrokenPageError, BrowserPasswordExpired
from weboob.deprecated.browser import Page, BrokenPageError, BrowserPasswordExpired
class AccountsList(Page):

2
modules/bnporc/perso/login.py
View file

@ -22,7 +22,7 @@ import time
import re
import urllib
from weboob.tools.browser import Page, BrowserUnavailable
from weboob.deprecated.browser import Page, BrowserUnavailable
from weboob.tools.captcha.virtkeyboard import VirtKeyboard, VirtKeyboardError

2
modules/bnporc/perso/messages.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Page, BrokenPageError
from weboob.deprecated.browser import Page, BrokenPageError
from weboob.capabilities.messages import Message, Thread
from weboob.capabilities.base import NotLoaded
from weboob.tools.capabilities.messages.genericArticle import try_drop_tree

2
modules/bnporc/perso/transactions.py
View file

@ -20,7 +20,7 @@
import re
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

2
modules/bnporc/perso/transfer.py
View file

@ -20,7 +20,7 @@
import re
from weboob.tools.browser import Page, BrowserPasswordExpired
from weboob.deprecated.browser import Page, BrowserPasswordExpired
from weboob.tools.ordereddict import OrderedDict
from weboob.capabilities.bank import TransferError

2
modules/bnporc/pro.py
View file

@ -24,7 +24,7 @@ from decimal import Decimal, InvalidOperation
from weboob.capabilities import NotAvailable
from weboob.capabilities.bank import Account
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from .perso.transactions import Transaction

2
modules/boursorama/browser.py
View file

@ -20,7 +20,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, AccountsList, AccountHistory, CardHistory, UpdateInfoPage, AuthenticationPage

2
modules/boursorama/pages/account_history.py
View file

@ -22,7 +22,7 @@
from urlparse import urlparse
import re
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

2
modules/boursorama/pages/accounts_list.py
View file

@ -22,7 +22,7 @@
from decimal import Decimal
from weboob.capabilities.bank import Account
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

2
modules/boursorama/pages/card_history.py
View file

@ -21,7 +21,7 @@
import re
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

2
modules/boursorama/pages/login.py
View file

@ -22,7 +22,7 @@ import re
import hashlib
import urllib
from weboob.tools.browser import Page, BrowserIncorrectPassword
from weboob.deprecated.browser import Page, BrowserIncorrectPassword
from weboob.tools.captcha.virtkeyboard import MappedVirtKeyboard

2
modules/boursorama/pages/two_authentication.py
View file

@ -17,7 +17,7 @@
# 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.browser import Page, BrowserIncorrectPassword
from weboob.deprecated.browser import Page, BrowserIncorrectPassword
import urllib2
import re

2
modules/bouygues/browser.py
View file

@ -21,7 +21,7 @@
from .pages.compose import ComposeFrame, ComposePage, ConfirmPage, SentPage
from .pages.login import LoginPage, LoginSASPage
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
__all__ = ['BouyguesBrowser']

2
modules/bouygues/pages/compose.py
View file

@ -21,7 +21,7 @@
import re
from weboob.capabilities.messages import CantSendMessage
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
class ComposeFrame(Page):

2
modules/bouygues/pages/login.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
class LoginPage(Page):

2
modules/bp/browser.py
View file

@ -21,7 +21,7 @@
from urlparse import urlsplit, parse_qsl
from datetime import datetime
from weboob.tools.browser import Browser, BrowserIncorrectPassword, BrowserBanned
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword, BrowserBanned
from .pages import LoginPage, Initident, CheckPassword, repositionnerCheminCourant, BadLoginPage, AccountDesactivate, \
AccountList, AccountHistory, CardsList, UnavailablePage, \

2
modules/bp/pages/accounthistory.py
View file

@ -22,7 +22,7 @@ import datetime
import re
from weboob.tools.capabilities.bank.transactions import FrenchTransaction
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
class Transaction(FrenchTransaction):

2
modules/bp/pages/accountlist.py
View file

@ -21,7 +21,7 @@
from decimal import Decimal
from weboob.capabilities.bank import Account, AccountNotFound
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.misc import to_unicode
from weboob.tools.capabilities.bank.transactions import FrenchTransaction
from weboob.tools.ordereddict import OrderedDict

2
modules/bp/pages/login.py
View file

@ -23,7 +23,7 @@ import hashlib
import re
import lxml.etree as etree
from weboob.tools.browser import Page, BrowserUnavailable
from weboob.deprecated.browser import Page, BrowserUnavailable
from weboob.tools.captcha.virtkeyboard import VirtKeyboard

2
modules/bp/pages/transfer.py
View file

@ -21,7 +21,7 @@
import re
from weboob.capabilities.bank import TransferError
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.misc import to_unicode

2
modules/bred/browser.py
View file

@ -20,7 +20,7 @@
import urllib
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, LoginResultPage, AccountsPage, EmptyPage, TransactionsPage

4
modules/bred/pages.py
View file

@ -19,13 +19,13 @@
from mechanize import FormNotFoundError
from weboob.tools.mech import ClientForm
from weboob.deprecated.mech import ClientForm
ControlNotFoundError = ClientForm.ControlNotFoundError
from decimal import Decimal, InvalidOperation
import re
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.misc import to_unicode
from weboob.tools.ordereddict import OrderedDict
from weboob.capabilities.bank import Account

2
modules/btdigg/browser.py
View file

@ -2,7 +2,7 @@
import urllib
from weboob.tools.browser import Browser
from weboob.deprecated.browser import Browser
from .pages.index import IndexPage
from .pages.torrents import TorrentsPage, TorrentPage

2
modules/btdigg/pages/index.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
class IndexPage(Page):

2
modules/btdigg/pages/torrents.py
View file

@ -4,7 +4,7 @@ from datetime import datetime, timedelta
from urlparse import urlparse, parse_qs
from weboob.tools.misc import get_bytes_size
from weboob.tools.browser import Page,BrokenPageError
from weboob.deprecated.browser import Page,BrokenPageError
from weboob.capabilities.torrent import Torrent, MagnetOnly
from weboob.capabilities.base import NotAvailable

2
modules/btmon/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserHTTPNotFound
from weboob.deprecated.browser import Browser, BrowserHTTPNotFound
from .pages import TorrentsPage, TorrentPage

2
modules/btmon/pages.py
View file

@ -22,7 +22,7 @@ import string
from weboob.capabilities.torrent import Torrent
from weboob.capabilities.base import NotAvailable, NotLoaded
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.tools.misc import get_bytes_size

2
modules/caissedepargne/browser.py
View file

@ -22,7 +22,7 @@ import ssl
import hashlib
from urlparse import urlsplit
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, IndexPage, ErrorPage, UnavailablePage

6
modules/caissedepargne/pages.py
View file

@ -18,15 +18,15 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.mech import ClientForm
from weboob.deprecated.mech import ClientForm
ControlNotFoundError = ClientForm.ControlNotFoundError
from decimal import Decimal
import re
from weboob.tools.mech import ClientForm
from weboob.deprecated.mech import ClientForm
from weboob.tools.ordereddict import OrderedDict
from weboob.tools.browser import Page, BrokenPageError, BrowserUnavailable, BrowserIncorrectPassword
from weboob.deprecated.browser import Page, BrokenPageError, BrowserUnavailable, BrowserIncorrectPassword
from weboob.capabilities import NotAvailable
from weboob.capabilities.bank import Account
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

4
modules/canalplus/browser.py
View file

@ -22,8 +22,8 @@ import urllib
import lxml.etree
from weboob.tools.browser import Browser
from weboob.tools.browser.decorators import id2url
from weboob.deprecated.browser import Browser
from weboob.deprecated.browser.decorators import id2url
from .pages import ChannelsPage, VideoPage
from .video import CanalplusVideo

2
modules/canalplus/pages.py
View file

@ -20,7 +20,7 @@
from datetime import datetime
import re
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.capabilities.collection import Collection
from weboob.capabilities.base import NotAvailable, NotLoaded
from weboob.capabilities.image import BaseImage

4
modules/canaltp/browser.py
View file

@ -20,9 +20,9 @@
from datetime import datetime, date, time
from weboob.tools.browser import Browser
from weboob.deprecated.browser import Browser
from weboob.tools.misc import to_unicode
from weboob.tools.browser import BrokenPageError
from weboob.deprecated.browser import BrokenPageError
__all__ = ['CanalTP']

8
modules/cappedtv/browser.py
View file

@ -13,10 +13,10 @@ import urllib
import datetime
from weboob.capabilities.base import NotAvailable
from weboob.tools.misc import to_unicode
from weboob.tools.browser import Page
from weboob.tools.browser import BrokenPageError
from weboob.tools.browser import Browser
from weboob.tools.browser.decorators import id2url
from weboob.deprecated.browser import Page
from weboob.deprecated.browser import BrokenPageError
from weboob.deprecated.browser import Browser
from weboob.deprecated.browser.decorators import id2url
from weboob.capabilities.image import BaseImage
from weboob.capabilities.video import BaseVideo
from weboob.tools.ordereddict import OrderedDict

4
modules/carrefourbanque/browser.py
View file

@ -18,8 +18,8 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.browser2 import LoginBrowser, URL, need_login
from weboob.core.exceptions import BrowserIncorrectPassword
from weboob.browser import LoginBrowser, URL, need_login
from weboob.exceptions import BrowserIncorrectPassword
from .pages import LoginPage, HomePage, TransactionsPage

8
modules/carrefourbanque/pages.py
View file

@ -20,10 +20,10 @@
import re
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.browser.pages import HTMLPage, LoggedPage
from weboob.browser.elements import ListElement, ItemElement, method
from weboob.browser.filters.standard import Regexp, CleanText, CleanDecimal, Format
from weboob.browser.filters.html import Link
from weboob.capabilities.bank import Account
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

2
modules/cci/browser.py
View file

@ -17,7 +17,7 @@
# 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.browser2 import PagesBrowser, URL
from weboob.browser import PagesBrowser, URL
from weboob.capabilities.job import BaseJobAdvert
from .pages import SearchPage

8
modules/cci/pages.py
View file

@ -17,10 +17,10 @@
# 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.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.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.capabilities.job import BaseJobAdvert

2
modules/champslibres/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, HomePage, HistoryPage, RentedPage

4
modules/champslibres/pages.py
View file

@ -19,8 +19,8 @@
from datetime import date
from weboob.capabilities.library import Book, Renew
from weboob.tools.browser import Page
from weboob.tools.mech import ClientForm
from weboob.deprecated.browser import Page
from weboob.deprecated.mech import ClientForm
from weboob.tools.html import html2text

2
modules/chronopost/browser.py
View file

@ -17,7 +17,7 @@
# 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.browser import Browser
from weboob.deprecated.browser import Browser
from .pages import IndexPage, TrackPage

2
modules/chronopost/pages.py
View file

@ -23,7 +23,7 @@ from dateutil.parser import parse as parse_date
from weboob.capabilities.parcel import Parcel, Event
from weboob.capabilities import NotAvailable
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
class IndexPage(Page):

2
modules/cic/browser.py
View file

@ -21,7 +21,7 @@
from urlparse import urlsplit, parse_qsl, urlparse
from datetime import datetime, timedelta
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from weboob.capabilities.bank import Transfer, TransferError
from .pages import LoginPage, LoginErrorPage, AccountsPage, UserSpacePage, EmptyPage, \

2
modules/cic/pages.py
View file

@ -24,7 +24,7 @@ from decimal import Decimal
import re
from dateutil.relativedelta import relativedelta
from weboob.tools.browser import Page, BrowserIncorrectPassword, BrokenPageError
from weboob.deprecated.browser import Page, BrowserIncorrectPassword, BrokenPageError
from weboob.tools.ordereddict import OrderedDict
from weboob.capabilities.bank import Account
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

2
modules/citelis/browser.py
View file

@ -19,7 +19,7 @@
from weboob.capabilities.bank import Account
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, SummaryPage, UselessPage, TransactionSearchPage, TransactionsPage, TransactionsCsvPage

2
modules/citelis/pages.py
View file

@ -22,7 +22,7 @@ from decimal import Decimal
import datetime
import re
from weboob.tools.browser import Page, BrowserIncorrectPassword
from weboob.deprecated.browser import Page, BrowserIncorrectPassword
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

4
modules/cmb/module.py
View file

@ -22,8 +22,8 @@ from weboob.capabilities.bank import Account, Transaction
from weboob.tools.backend import Module, BackendConfig
from weboob.tools.value import ValueBackendPassword
from weboob.capabilities.base import NotAvailable
from weboob.core.exceptions import BrowserIncorrectPassword, ParseError
from weboob.browser2 import Browser
from weboob.exceptions import BrowserIncorrectPassword, ParseError
from weboob.browser import Browser
from re import match, compile, sub
from decimal import Decimal

2
modules/cmso/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.browser import Browser, BrowserIncorrectPassword
from weboob.deprecated.browser import Browser, BrowserIncorrectPassword
from .pages import LoginPage, AccountsPage, TransactionsPage

2
modules/cmso/pages.py
View file

@ -22,7 +22,7 @@ import datetime
from decimal import Decimal
import re
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.capabilities.bank import Account
from weboob.tools.capabilities.bank.transactions import FrenchTransaction

2
modules/colisprive/browser.py
View file

@ -17,7 +17,7 @@
# 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.browser import Browser
from weboob.deprecated.browser import Browser
from .pages import TrackPage, ErrorPage

2
modules/colisprive/pages.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from datetime import date
from weboob.tools.browser import Page
from weboob.deprecated.browser import Page
from weboob.capabilities.parcel import Parcel, Event

2
modules/colissimo/browser.py
View file

@ -18,7 +18,7 @@
# along with weboob. If not, see <http://www.gnu.org/licenses/>.
from weboob.tools.json import json
from weboob.tools.browser import Browser, BrowserBanned
from weboob.deprecated.browser import Browser, BrowserBanned
__all__ = ['ColissimoBrowser']

Some files were not shown because too many files have changed in this diff Show more