diff --git a/modules/creditmutuel/browser.py b/modules/creditmutuel/browser.py index 2c80e4b1..84aecc37 100644 --- a/modules/creditmutuel/browser.py +++ b/modules/creditmutuel/browser.py @@ -22,7 +22,7 @@ from urlparse import urlsplit, parse_qsl, urlparse from datetime import datetime, timedelta from weboob.tools.browser2 import LoginBrowser, URL, Wget, need_login -from weboob.tools.browser import BrowserIncorrectPassword +from weboob.tools.exceptions import BrowserIncorrectPassword from weboob.capabilities.bank import Transfer, TransferError from .pages import LoginPage, LoginErrorPage, AccountsPage, UserSpacePage, \ diff --git a/modules/creditmutuel/pages.py b/modules/creditmutuel/pages.py index 3ab44f00..7a7a555d 100644 --- a/modules/creditmutuel/pages.py +++ b/modules/creditmutuel/pages.py @@ -25,7 +25,7 @@ from dateutil.relativedelta import relativedelta from weboob.tools.browser2.page import HTMLPage, method, ListElement, ItemElement, SkipItem, FormNotFound, LoggedPage from weboob.tools.browser2.filters import Filter, Env, CleanText, CleanDecimal, Link, Field, TableCell -from weboob.tools.browser import BrowserIncorrectPassword +from weboob.tools.exceptions import BrowserIncorrectPassword from weboob.capabilities import NotAvailable from weboob.capabilities.bank import Account from weboob.tools.capabilities.bank.transactions import FrenchTransaction diff --git a/weboob/tools/application/console.py b/weboob/tools/application/console.py index a36c44d9..badf1b8d 100644 --- a/weboob/tools/application/console.py +++ b/weboob/tools/application/console.py @@ -34,7 +34,7 @@ from weboob.capabilities.account import ICapAccount, Account, AccountRegisterErr from weboob.core.backendscfg import BackendAlreadyExists from weboob.core.modules import ModuleLoadError from weboob.core.repositories import ModuleInstallError -from weboob.tools.browser import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden +from weboob.tools.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden from weboob.tools.value import Value, ValueBool, ValueFloat, ValueInt, ValueBackendPassword from weboob.tools.misc import to_unicode from weboob.tools.ordereddict import OrderedDict diff --git a/weboob/tools/browser/browser.py b/weboob/tools/browser/browser.py index 6e93dc0d..e10f3cba 100644 --- a/weboob/tools/browser/browser.py +++ b/weboob/tools/browser/browser.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2010-2011 Romain Bignon +# Copyright(C) 2010-2014 Romain Bignon # # This file is part of weboob. # @@ -45,6 +45,7 @@ from contextlib import closing from gzip import GzipFile import warnings +from weboob.tools.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserPasswordExpired, BrowserForbidden, BrowserBanned, BrowserHTTPNotFound, BrowserHTTPError from weboob.tools.decorators import retry from weboob.tools.log import getLogger from weboob.tools.mech import ClientForm @@ -62,39 +63,10 @@ else: __all__ = ['BrowserIncorrectPassword', 'BrowserForbidden', 'BrowserBanned', 'BrowserUnavailable', 'BrowserRetry', - 'BrowserHTTPNotFound', 'BrowserHTTPError', 'BrokenPageError', 'BasePage', + 'BrowserPasswordExpired', 'BrowserHTTPNotFound', 'BrowserHTTPError', 'BrokenPageError', 'BasePage', 'StandardBrowser', 'BaseBrowser'] -# Exceptions -class BrowserIncorrectPassword(Exception): - pass - - -class BrowserForbidden(Exception): - pass - - -class BrowserBanned(BrowserIncorrectPassword): - pass - - -class BrowserPasswordExpired(BrowserIncorrectPassword): - pass - - -class BrowserUnavailable(Exception): - pass - - -class BrowserHTTPNotFound(BrowserUnavailable): - pass - - -class BrowserHTTPError(BrowserUnavailable): - pass - - class BrowserRetry(Exception): pass diff --git a/weboob/tools/exceptions.py b/weboob/tools/exceptions.py new file mode 100644 index 00000000..6d0527da --- /dev/null +++ b/weboob/tools/exceptions.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- + +# Copyright(C) 2014 Romain Bignon +# +# This file is part of weboob. +# +# weboob is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# weboob is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with weboob. If not, see . + + +class BrowserIncorrectPassword(Exception): + pass + + +class BrowserForbidden(Exception): + pass + + +class BrowserBanned(BrowserIncorrectPassword): + pass + + +class BrowserPasswordExpired(BrowserIncorrectPassword): + pass + + +class BrowserUnavailable(Exception): + pass + + +class BrowserHTTPNotFound(BrowserUnavailable): + pass + + +class BrowserHTTPError(BrowserUnavailable): + pass + +