rename things related to browsers

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

modules/750g/browser.py

@@ -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
 

modules/750g/pages.py

@@ -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):

modules/adecco/browser.py

@@ -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

modules/adecco/pages.py

@@ -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

modules/agendadulibre/browser.py

@@ -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

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 <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

modules/allocine/browser.py

@@ -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

modules/alloresto/browser.py

@@ -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
 

modules/alloresto/pages.py

@@ -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
 

modules/allrecipes/browser.py

@@ -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
 

modules/allrecipes/pages.py

@@ -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):

modules/ameli/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 <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

modules/ameli/pages.py

@@ -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
 
 

modules/amelipro/browser.py

@@ -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

modules/amelipro/pages.py

@@ -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
 
 

modules/americanexpress/browser.py

@@ -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
 

modules/americanexpress/pages.py

@@ -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

modules/apec/browser.py

@@ -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

modules/apec/pages.py

@@ -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

modules/apivie/browser.py

@@ -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
 

modules/apivie/pages.py

@@ -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
 
 

modules/arretsurimages/browser.py

@@ -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

modules/arretsurimages/pages.py

@@ -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
 
 

modules/arte/browser.py

@@ -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

modules/arte/pages.py

@@ -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

modules/attilasub/browser.py

@@ -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
 

modules/attilasub/pages.py

@@ -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):

modules/audioaddict/module.py

@@ -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']

modules/aum/browser.py

@@ -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

modules/aum/module.py

@@ -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

modules/aum/optim/profiles_walker.py

@@ -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
 

modules/aum/optim/queries_queue.py

@@ -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

modules/aum/optim/visibility.py

@@ -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
 
 

modules/aum/test.py

@@ -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):

modules/axabanque/browser.py

@@ -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
 

modules/axabanque/pages.py

@@ -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

modules/banqueaccord/browser.py

@@ -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
 

modules/banqueaccord/pages.py

@@ -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):

modules/banquepopulaire/browser.py

@@ -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

modules/banquepopulaire/pages.py

@@ -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
 

modules/barclays/browser.py

@@ -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

modules/barclays/pages.py

@@ -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
 

modules/biplan/browser.py

@@ -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
 

modules/biplan/pages.py

@@ -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):

modules/bnporc/browser.py

@@ -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

modules/bnporc/enterprise/browser.py

@@ -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
 

modules/bnporc/enterprise/pages.py

@@ -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

modules/bnporc/perso/accounts_list.py

@@ -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):

modules/bnporc/perso/login.py

@@ -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
 
 

modules/bnporc/perso/messages.py

@@ -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

modules/bnporc/perso/transactions.py

@@ -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
 
 

modules/bnporc/perso/transfer.py

@@ -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
 

modules/bnporc/pro.py

@@ -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
 

modules/boursorama/browser.py

@@ -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
 

modules/boursorama/pages/account_history.py

@@ -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
 
 

modules/boursorama/pages/accounts_list.py

@@ -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
 
 

modules/boursorama/pages/card_history.py

@@ -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
 
 

modules/boursorama/pages/login.py

@@ -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
 
 

modules/boursorama/pages/two_authentication.py

@@ -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
 

modules/bouygues/browser.py

@@ -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']

modules/bouygues/pages/compose.py

@@ -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):

modules/bouygues/pages/login.py

@@ -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):

modules/bp/browser.py

@@ -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, \

modules/bp/pages/accounthistory.py

@@ -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):

modules/bp/pages/accountlist.py

@@ -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

modules/bp/pages/login.py

@@ -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
 
 

modules/bp/pages/transfer.py

@@ -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
 
 

modules/bred/browser.py

@@ -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
 

modules/bred/pages.py

@@ -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

modules/btdigg/browser.py

@@ -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

modules/btdigg/pages/index.py

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

modules/btdigg/pages/torrents.py

@@ -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
 

modules/btmon/browser.py

@@ -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
 

modules/btmon/pages.py

@@ -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
 
 

modules/caissedepargne/browser.py

@@ -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
 

modules/caissedepargne/pages.py

@@ -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

modules/canalplus/browser.py

@@ -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

modules/canalplus/pages.py

@@ -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

modules/canaltp/browser.py

@@ -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']

modules/cappedtv/browser.py

@@ -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

modules/carrefourbanque/browser.py

@@ -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
 

modules/carrefourbanque/pages.py

@@ -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

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 <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

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 <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
 

modules/champslibres/browser.py

@@ -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
 

modules/champslibres/pages.py

@@ -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
 
 

modules/chronopost/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 <http://www.gnu.org/licenses/>.
 
-from weboob.tools.browser import Browser
+from weboob.deprecated.browser import Browser
 
 from .pages import IndexPage, TrackPage
 

modules/chronopost/pages.py

@@ -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):

modules/cic/browser.py

@@ -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, \

modules/cic/pages.py

@@ -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

modules/citelis/browser.py

@@ -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
 

modules/citelis/pages.py

@@ -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
 
 

modules/cmb/module.py

@@ -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

modules/cmso/browser.py

@@ -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
 

modules/cmso/pages.py

@@ -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
 

modules/colisprive/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 <http://www.gnu.org/licenses/>.
 
-from weboob.tools.browser import Browser
+from weboob.deprecated.browser import Browser
 from .pages import TrackPage, ErrorPage
 
 

modules/colisprive/pages.py

@@ -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
 
 

modules/colissimo/browser.py

@@ -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']

modules/cragr/mobile/browser.py

@@ -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 weboob.tools.date import LinearDateGuesser
 from weboob.capabilities.bank import Transfer, TransferError
 from .pages import LoginPage, AccountsList

modules/cragr/mobile/pages/base.py

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