diff --git a/modules/alloresto/browser.py b/modules/alloresto/browser.py index c7d772f92c62e736b34cf28ce2131fe052e68517..0c0872f9d6e578c4d8c94f9b5e043d4a1148ac91 100644 --- a/modules/alloresto/browser.py +++ b/modules/alloresto/browser.py @@ -19,7 +19,7 @@ from weboob.browser2 import LoginBrowser, URL, need_login -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword from .pages import LoginPage, AccountsPage diff --git a/modules/banqueaccord/browser.py b/modules/banqueaccord/browser.py index 757f4cd953fd7d07bcdbfc2d6befbcda9243dccf..2f1ab704f9b1c7436f6c8210f6320c8767e98469 100644 --- a/modules/banqueaccord/browser.py +++ b/modules/banqueaccord/browser.py @@ -19,7 +19,7 @@ from weboob.browser2 import LoginBrowser, need_login, URL -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword from .pages import LoginPage, IndexPage, AccountsPage, OperationsPage diff --git a/modules/banqueaccord/pages.py b/modules/banqueaccord/pages.py index c6501c333a9bb0021cb8b05c9dfa184856c20d64..8f7adee41b460ce2c23fde050cab7a8356721a34 100644 --- a/modules/banqueaccord/pages.py +++ b/modules/banqueaccord/pages.py @@ -30,7 +30,7 @@ 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 +from weboob.core.exceptions import ParseError class Transaction(FrenchTransaction): diff --git a/modules/carrefourbanque/browser.py b/modules/carrefourbanque/browser.py index 7a1c62f733d1a433a0a8a35f7734e8f3e3a5e116..9e6d57f218b0385e76a6491802cb950d91ecb582 100644 --- a/modules/carrefourbanque/browser.py +++ b/modules/carrefourbanque/browser.py @@ -19,7 +19,7 @@ from weboob.browser2 import LoginBrowser, URL, need_login -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword from .pages import LoginPage, HomePage, TransactionsPage diff --git a/modules/cmb/module.py b/modules/cmb/module.py index aa728de6fd96d737a32f2a033b04c923f87ecedb..075e9ada307265041fd57df40313071b41f54b66 100644 --- a/modules/cmb/module.py +++ b/modules/cmb/module.py @@ -22,7 +22,7 @@ from weboob.tools.backend import Module, BackendConfig from weboob.tools.value import ValueBackendPassword from weboob.capabilities.base import NotAvailable -from weboob.tools.exceptions import BrowserIncorrectPassword, ParseError +from weboob.core.exceptions import BrowserIncorrectPassword, ParseError from weboob.browser2 import Browser from re import match, compile, sub diff --git a/modules/creditmutuel/browser.py b/modules/creditmutuel/browser.py index d1f9a4ffd12bfeb28f072eba7e27c7ac3c650e73..310fee4dc02139766f0f5c2d9cf89d3d03d157f6 100644 --- a/modules/creditmutuel/browser.py +++ b/modules/creditmutuel/browser.py @@ -27,7 +27,7 @@ from weboob.tools.compat import basestring from weboob.browser2 import LoginBrowser, URL, Wget, need_login -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.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 8b7173d7cb78004eee739b7ffd9e2ce414952e1d..7ffc20f0a1eda393ca8f781b50f66afa53fe5115 100644 --- a/modules/creditmutuel/pages.py +++ b/modules/creditmutuel/pages.py @@ -31,7 +31,7 @@ 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.core.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/modules/feedly/google.py b/modules/feedly/google.py index d8638d3b98089832cb0e852d912891dd1073c44c..1535546530f2d278110a9b53c0da5b14a42ac0db 100644 --- a/modules/feedly/google.py +++ b/modules/feedly/google.py @@ -20,7 +20,7 @@ from urlparse import urlparse, parse_qs from weboob.browser2 import LoginBrowser, URL, HTMLPage -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword class GoogleLoginPage(HTMLPage): diff --git a/modules/freemobile/browser.py b/modules/freemobile/browser.py index 003c0aed1850173990edaff41371fbaca1b6a955..5de18f3cd87878d43771064599c8b9b2bb7cfc3d 100644 --- a/modules/freemobile/browser.py +++ b/modules/freemobile/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.browser2 import LoginBrowser, URL, need_login -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword from .pages import HomePage, LoginPage, HistoryPage, DetailsPage __all__ = ['Freemobile'] diff --git a/modules/groupamaes/browser.py b/modules/groupamaes/browser.py index b8d591054bf06e4d997fcde728335fff6b99f22d..47992e87cdd15f5cc2b1f963468a341b348ea3fe 100644 --- a/modules/groupamaes/browser.py +++ b/modules/groupamaes/browser.py @@ -19,7 +19,7 @@ from weboob.browser2 import LoginBrowser, URL, need_login -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword from .pages import LoginPage, LoginErrorPage, AvoirPage, OperationsTraiteesPage, OperationsFuturesPage diff --git a/modules/hsbc/browser.py b/modules/hsbc/browser.py index 8aaad18d97491ee02a6a2fd21e260a3696540842..db3e803d08c31973816fc7e8c6f7e87f93ed4bae 100644 --- a/modules/hsbc/browser.py +++ b/modules/hsbc/browser.py @@ -22,7 +22,7 @@ from datetime import timedelta from weboob.tools.date import LinearDateGuesser -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword 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 6ca883636a6da27df714688f5c0d07b834ef2405..59197559d2497f7a4bd61a849e7aaa508bb22df8 100644 --- a/modules/hsbc/pages.py +++ b/modules/hsbc/pages.py @@ -24,7 +24,7 @@ from weboob.capabilities.bank import Account from weboob.tools.capabilities.bank.transactions import FrenchTransaction -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword 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 diff --git a/modules/ing/browser.py b/modules/ing/browser.py index e034f6bc6d42d6dc47b878eeb36a397c35fa43f1..29183c375f3c2390fac19a043efc40a15ed0e7bb 100644 --- a/modules/ing/browser.py +++ b/modules/ing/browser.py @@ -19,7 +19,7 @@ import hashlib from weboob.browser2 import LoginBrowser, URL, need_login -from weboob.tools.exceptions import BrowserIncorrectPassword, ParseError +from weboob.core.exceptions import BrowserIncorrectPassword, ParseError from weboob.capabilities.bank import Account, TransferError from .pages import AccountsList, LoginPage, TitrePage, TitreHistory,\ diff --git a/modules/ing/pages/login.py b/modules/ing/pages/login.py index 15e2132c9e0499bdea174de66fd527fe6feb352e..efb89a184c88954425f1ce71e6dc4e6af8872cc3 100644 --- a/modules/ing/pages/login.py +++ b/modules/ing/pages/login.py @@ -19,7 +19,7 @@ from StringIO import StringIO -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword from weboob.tools.captcha.virtkeyboard import VirtKeyboard from weboob.browser2.page import HTMLPage diff --git a/modules/oney/browser.py b/modules/oney/browser.py index 3f68bcc494b97dbd8acdfa3f1be36d990f9a52b9..088f8e3620264fc4bf091ef55fd1bd30247b835a 100644 --- a/modules/oney/browser.py +++ b/modules/oney/browser.py @@ -19,7 +19,7 @@ from weboob.capabilities.bank import Account -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword 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 7be4b2b5de2edaea3bd8a618ec4cbacc703e5d60..0263f0b0427b6960899324175a48772680aa9cdd 100644 --- a/modules/oney/pages.py +++ b/modules/oney/pages.py @@ -28,7 +28,7 @@ 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 +from weboob.core.exceptions import ParseError class Transaction(FrenchTransaction): diff --git a/modules/pastealacon/browser.py b/modules/pastealacon/browser.py index 8cf10382ee4b1b8145de1dd2436d411dc52d34a2..caf6a16a5d96cd73882c94d823845e4116e621f0 100644 --- a/modules/pastealacon/browser.py +++ b/modules/pastealacon/browser.py @@ -23,7 +23,7 @@ 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 +from weboob.core.exceptions import BrowserHTTPNotFound class Spam(Exception): diff --git a/modules/pastebin/browser.py b/modules/pastebin/browser.py index 57ffca9b0bde7a5d3d74ac882aa9ee652474051c..5c79e1d2050c1df601e80c39e7224875ab7282cf 100644 --- a/modules/pastebin/browser.py +++ b/modules/pastebin/browser.py @@ -26,7 +26,7 @@ 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 +from weboob.core.exceptions import BrowserHTTPNotFound, BrowserIncorrectPassword, BrowserUnavailable class PastebinPaste(BasePaste): diff --git a/modules/poivy/browser.py b/modules/poivy/browser.py index 7b4c386a7203bc74ee2aed0aca50531ed8cb54cd..f817cf8e47b26d3767c17858ef4c194cad9cd098 100644 --- a/modules/poivy/browser.py +++ b/modules/poivy/browser.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from weboob.browser2 import LoginBrowser, URL, need_login -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword from .pages import HomePage, LoginPage, HistoryPage, BillsPage, ErrorPage diff --git a/modules/poivy/pages.py b/modules/poivy/pages.py index d6a869df10c4285388c9cda151a7c112e9eb2cd4..abf22f535b67477d345f9e5da38827c7a33c726b 100644 --- a/modules/poivy/pages.py +++ b/modules/poivy/pages.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.exceptions import BrowserBanned +from weboob.core.exceptions import BrowserBanned 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 diff --git a/modules/redmine/module.py b/modules/redmine/module.py index 3f403e38921c6e301969bc8b17f385555d86d24b..c33bd8911ea35f1fa30c575dc8203fe9d816e860 100644 --- a/modules/redmine/module.py +++ b/modules/redmine/module.py @@ -26,7 +26,7 @@ Query, Change from weboob.capabilities.collection import CapCollection, Collection, CollectionNotFound from weboob.tools.backend import Module, BackendConfig -from weboob.tools.exceptions import BrowserHTTPNotFound +from weboob.core.exceptions import BrowserHTTPNotFound from weboob.tools.value import ValueBackendPassword, Value from .browser import RedmineBrowser diff --git a/modules/tinder/browser.py b/modules/tinder/browser.py index 5b4f2fed3527525c87c27e1d5cec4da1d9d688b6..0d01d5e100fdf98309987afd2f23d7ad9edf0097 100644 --- a/modules/tinder/browser.py +++ b/modules/tinder/browser.py @@ -21,7 +21,7 @@ import re from weboob.browser2 import DomainBrowser, HTMLPage, Profile -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword from weboob.tools.json import json diff --git a/modules/twitter/module.py b/modules/twitter/module.py index cc35448e5030ae9ba68d4566348644f72f04f08d..7e87b4542fc4f343fcdb4e764e6c6e3641bd5ac1 100644 --- a/modules/twitter/module.py +++ b/modules/twitter/module.py @@ -23,7 +23,7 @@ from weboob.capabilities.messages import CapMessages, Thread, CapMessagesPost from weboob.capabilities.collection import CapCollection, CollectionNotFound, Collection from weboob.capabilities.base import find_object -from weboob.tools.exceptions import BrowserForbidden +from weboob.core.exceptions import BrowserForbidden from .browser import TwitterBrowser import itertools diff --git a/modules/vimeo/pages.py b/modules/vimeo/pages.py index 6e9c817363dbdc3f50d713fb400735974486de5d..be44ee9a7310f958f88c334f4b44f55663c9dc6b 100644 --- a/modules/vimeo/pages.py +++ b/modules/vimeo/pages.py @@ -20,7 +20,7 @@ from weboob.capabilities.video import BaseVideo from weboob.capabilities.image import BaseImage -from weboob.tools.exceptions import ParseError +from weboob.core.exceptions import ParseError 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 diff --git a/modules/wellsfargo/browser.py b/modules/wellsfargo/browser.py index 82f0e89ca74a87961bb3ac66b87121c2edaa8251..b9c87c16855c7f9783405b9d336c568163ea67a2 100644 --- a/modules/wellsfargo/browser.py +++ b/modules/wellsfargo/browser.py @@ -22,7 +22,7 @@ from weboob.capabilities.bank import AccountNotFound from weboob.browser2 import LoginBrowser, URL, need_login -from weboob.tools.exceptions import BrowserIncorrectPassword +from weboob.core.exceptions import BrowserIncorrectPassword from .pages import LoginPage, LoginRedirectPage, LoggedInPage, SummaryPage, \ DynamicPage diff --git a/weboob/browser2/exceptions.py b/weboob/browser2/exceptions.py index 6c5c6585624f242f39b346bed0cf22c0a34e2d67..54260d00d014a7155e227b86d7945eff08f719fb 100644 --- a/weboob/browser2/exceptions.py +++ b/weboob/browser2/exceptions.py @@ -18,7 +18,7 @@ # along with weboob. If not, see . from requests.exceptions import HTTPError -from weboob.tools.exceptions import BrowserHTTPError, BrowserHTTPNotFound +from weboob.core.exceptions import BrowserHTTPError, BrowserHTTPNotFound class HTTPNotFound(HTTPError, BrowserHTTPNotFound): diff --git a/weboob/browser2/filters/javascript.py b/weboob/browser2/filters/javascript.py index 290afc9ded8aca62370bbcef4630b5a2df3c9e25..51546b9d58095617b58a1bcec36fab6ac3cacdc1 100644 --- a/weboob/browser2/filters/javascript.py +++ b/weboob/browser2/filters/javascript.py @@ -22,7 +22,7 @@ from ast import literal_eval from weboob.browser2.filters.standard import Filter, Regexp, RegexpError -from weboob.tools.exceptions import ParseError +from weboob.core.exceptions import ParseError __all__ = ['JSPayload', 'JSVar'] diff --git a/weboob/browser2/filters/standard.py b/weboob/browser2/filters/standard.py index f806c0c32e153abd5fae95c35a10f63dff31e86a..7a391579557708ac8aaf0258631831f7eab1d255 100644 --- a/weboob/browser2/filters/standard.py +++ b/weboob/browser2/filters/standard.py @@ -28,7 +28,7 @@ from weboob.capabilities.base import empty from weboob.tools.compat import basestring -from weboob.tools.exceptions import ParseError +from weboob.core.exceptions import ParseError from weboob.browser2 import URL from weboob.tools.log import getLogger diff --git a/weboob/tools/exceptions.py b/weboob/core/exceptions.py similarity index 100% rename from weboob/tools/exceptions.py rename to weboob/core/exceptions.py diff --git a/weboob/core/repositories.py b/weboob/core/repositories.py index c4d37f5e6241a25afdce0b738a814441bf04d8ce..7720030fd4bb8badb260a8d438ba861f43991afa 100644 --- a/weboob/core/repositories.py +++ b/weboob/core/repositories.py @@ -31,7 +31,7 @@ from compileall import compile_dir from io import BytesIO -from weboob.tools.exceptions import BrowserHTTPError, BrowserHTTPNotFound +from weboob.core.exceptions import BrowserHTTPError, BrowserHTTPNotFound from .modules import LoadedModule from weboob.tools.log import getLogger from weboob.tools.misc import to_unicode diff --git a/weboob/tools/application/base.py b/weboob/tools/application/base.py index e3ccad96afe47f01b416684b30d5851707d91010..b8e083fb6c082253bb551bc12c0fdf2f8dee79c2 100644 --- a/weboob/tools/application/base.py +++ b/weboob/tools/application/base.py @@ -32,7 +32,7 @@ from weboob.core import Weboob, CallErrors from weboob.core.backendscfg import BackendsConfig from weboob.tools.config.iconfig import ConfigError -from weboob.tools.exceptions import FormFieldConversionWarning +from weboob.core.exceptions import FormFieldConversionWarning from weboob.tools.log import createColoredFormatter, getLogger, DebugFilter, settings as log_settings from weboob.tools.misc import to_unicode from .results import ResultsConditionError diff --git a/weboob/tools/application/console.py b/weboob/tools/application/console.py index 8224b95df276dc5768386e81103710297aee1cf7..37963a30ba576a3e4f733a92b6a259a45e119249 100644 --- a/weboob/tools/application/console.py +++ b/weboob/tools/application/console.py @@ -32,7 +32,7 @@ from weboob.core.backendscfg import BackendAlreadyExists from weboob.core.modules import ModuleLoadError from weboob.core.repositories import ModuleInstallError -from weboob.tools.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, BrowserSSLError +from weboob.core.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, BrowserSSLError 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/application/qt/qt.py b/weboob/tools/application/qt/qt.py index 521e48697250cdf3db7f1ae1ff898701c390d60b..58d3b1df299fa1b0ef22bc50a82fd857c405a7e3 100644 --- a/weboob/tools/application/qt/qt.py +++ b/weboob/tools/application/qt/qt.py @@ -34,7 +34,7 @@ from weboob.core.scheduler import IScheduler from weboob.core.repositories import ModuleInstallError from weboob.tools.config.iconfig import ConfigError -from weboob.tools.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden +from weboob.core.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden from weboob.tools.value import ValueInt, ValueBool, ValueBackendPassword from weboob.tools.misc import to_unicode from weboob.capabilities import UserError diff --git a/weboob/tools/browser/browser.py b/weboob/tools/browser/browser.py index b353f2450674c806d17c0442a53c508fde6eadbf..a2d0817d82bf769efa16f2162df638888e2ca5b1 100644 --- a/weboob/tools/browser/browser.py +++ b/weboob/tools/browser/browser.py @@ -49,7 +49,7 @@ from gzip import GzipFile import warnings -from weboob.tools.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserPasswordExpired, BrowserForbidden, BrowserBanned, BrowserHTTPNotFound, BrowserHTTPError, FormFieldConversionWarning, BrowserSSLError +from weboob.core.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserPasswordExpired, BrowserForbidden, BrowserBanned, BrowserHTTPNotFound, BrowserHTTPError, FormFieldConversionWarning, BrowserSSLError from weboob.tools.decorators import retry from weboob.tools.log import getLogger from weboob.tools.mech import ClientForm diff --git a/weboob/tools/capabilities/bank/transactions.py b/weboob/tools/capabilities/bank/transactions.py index 1396f7266e439cc781fa1cd498988aea30763aaa..81db9e006269a2f0f021e4874bd23808acba155c 100644 --- a/weboob/tools/capabilities/bank/transactions.py +++ b/weboob/tools/capabilities/bank/transactions.py @@ -27,7 +27,7 @@ from weboob.tools.misc import to_unicode from weboob.tools.log import getLogger -from weboob.tools.exceptions import ParseError +from weboob.core.exceptions import ParseError from weboob.browser2.elements import TableElement, ItemElement from weboob.browser2.filters.standard import Filter, CleanText, CleanDecimal, TableCell