From 69e41f008d8ff22c11a91d81fced6693bc7d91f7 Mon Sep 17 00:00:00 2001 From: Bezleputh Date: Thu, 8 Sep 2016 14:43:19 +0200 Subject: [PATCH] [exception] move ModuleInstallError from weboob/core/repositories.py to weboob.exceptions.py --- weboob/core/repositories.py | 6 +----- weboob/exceptions.py | 6 +++++- weboob/tools/application/console.py | 4 ++-- weboob/tools/application/qt/backendcfg.py | 3 ++- weboob/tools/application/qt/qt.py | 3 +-- weboob/tools/application/qt5/backendcfg.py | 3 ++- weboob/tools/application/qt5/qt.py | 3 +-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/weboob/core/repositories.py b/weboob/core/repositories.py index 308c3c201e..0c769f6591 100644 --- a/weboob/core/repositories.py +++ b/weboob/core/repositories.py @@ -32,7 +32,7 @@ from compileall import compile_dir from io import BytesIO -from weboob.exceptions import BrowserHTTPError, BrowserHTTPNotFound +from weboob.exceptions import BrowserHTTPError, BrowserHTTPNotFound, ModuleInstallError from .modules import LoadedModule from weboob.tools.log import getLogger from weboob.tools.misc import get_backtrace, to_unicode, find_exe @@ -401,10 +401,6 @@ def prompt(self, message): return True -class ModuleInstallError(Exception): - pass - - DEFAULT_SOURCES_LIST = \ """# List of Weboob repositories # diff --git a/weboob/exceptions.py b/weboob/exceptions.py index 5e27d75e58..a5dd63bc7f 100644 --- a/weboob/exceptions.py +++ b/weboob/exceptions.py @@ -18,7 +18,6 @@ # along with weboob. If not, see . - class BrowserIncorrectPassword(Exception): pass @@ -72,5 +71,10 @@ class FormFieldConversionWarning(UserWarning): A value has been set to a form's field and has been implicitly converted. """ + class NoAccountsException(Exception): pass + + +class ModuleInstallError(Exception): + pass diff --git a/weboob/tools/application/console.py b/weboob/tools/application/console.py index ad073e7804..ed5facd63b 100644 --- a/weboob/tools/application/console.py +++ b/weboob/tools/application/console.py @@ -31,8 +31,8 @@ from weboob.capabilities.account import CapAccount, Account, AccountRegisterError from weboob.core.backendscfg import BackendAlreadyExists from weboob.core.modules import ModuleLoadError -from weboob.core.repositories import ModuleInstallError, IProgress -from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, BrowserSSLError, BrowserQuestion, BrowserHTTPSDowngrade +from weboob.core.repositories import IProgress +from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, BrowserSSLError, BrowserQuestion, BrowserHTTPSDowngrade, ModuleInstallError from weboob.tools.value import Value, ValueBool, ValueFloat, ValueInt, ValueBackendPassword from weboob.tools.misc import to_unicode from weboob.tools.compat import check_output diff --git a/weboob/tools/application/qt/backendcfg.py b/weboob/tools/application/qt/backendcfg.py index 0c2367e247..f0d132a0c4 100644 --- a/weboob/tools/application/qt/backendcfg.py +++ b/weboob/tools/application/qt/backendcfg.py @@ -30,9 +30,10 @@ from logging import warning from weboob.core.modules import ModuleLoadError -from weboob.core.repositories import IProgress, ModuleInstallError +from weboob.core.repositories import IProgress from weboob.core.backendscfg import BackendAlreadyExists from weboob.capabilities.account import CapAccount, Account, AccountRegisterError +from weboob.exceptions import ModuleInstallError from .backendcfg_ui import Ui_BackendCfg from .reposdlg_ui import Ui_RepositoriesDlg from weboob.tools.ordereddict import OrderedDict diff --git a/weboob/tools/application/qt/qt.py b/weboob/tools/application/qt/qt.py index 04537725ab..b18a30f813 100644 --- a/weboob/tools/application/qt/qt.py +++ b/weboob/tools/application/qt/qt.py @@ -33,9 +33,8 @@ from weboob.core.ouiboube import Weboob, VersionsMismatchError from weboob.core.scheduler import IScheduler -from weboob.core.repositories import ModuleInstallError from weboob.tools.config.iconfig import ConfigError -from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden +from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, ModuleInstallError 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/application/qt5/backendcfg.py b/weboob/tools/application/qt5/backendcfg.py index 0f0d52ea88..17925927c4 100644 --- a/weboob/tools/application/qt5/backendcfg.py +++ b/weboob/tools/application/qt5/backendcfg.py @@ -31,9 +31,10 @@ from logging import warning from weboob.core.modules import ModuleLoadError -from weboob.core.repositories import IProgress, ModuleInstallError +from weboob.core.repositories import IProgress from weboob.core.backendscfg import BackendAlreadyExists from weboob.capabilities.account import CapAccount, Account, AccountRegisterError +from weboob.exceptions import ModuleInstallError from .backendcfg_ui import Ui_BackendCfg from .reposdlg_ui import Ui_RepositoriesDlg from weboob.tools.ordereddict import OrderedDict diff --git a/weboob/tools/application/qt5/qt.py b/weboob/tools/application/qt5/qt.py index a1d3df35fe..bb9e35af09 100644 --- a/weboob/tools/application/qt5/qt.py +++ b/weboob/tools/application/qt5/qt.py @@ -34,9 +34,8 @@ from weboob.core.ouiboube import Weboob, VersionsMismatchError from weboob.core.scheduler import IScheduler -from weboob.core.repositories import ModuleInstallError from weboob.tools.config.iconfig import ConfigError -from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden +from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, ModuleInstallError from weboob.tools.value import ValueInt, ValueBool, ValueBackendPassword from weboob.tools.misc import to_unicode from weboob.capabilities import UserError -- GitLab