From f7cd0abc3be040cb49e9b8248072274ed239d305 Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 8 Jul 2014 17:15:39 +0200 Subject: [PATCH] Remove import of browser1 in BaseApplication --- weboob/tools/application/base.py | 2 +- weboob/tools/browser/browser.py | 8 +------- weboob/tools/exceptions.py | 6 ++++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/weboob/tools/application/base.py b/weboob/tools/application/base.py index b6bb6402..e8461133 100644 --- a/weboob/tools/application/base.py +++ b/weboob/tools/application/base.py @@ -352,7 +352,7 @@ class BaseApplication(object): if not self.options.debug and not self.options.save_responses: warnings.simplefilter('ignore', category=ConversionWarning) try: - from weboob.tools.browser.browser import FormFieldConversionWarning + from weboob.tools.exceptions import FormFieldConversionWarning except ImportError: pass else: diff --git a/weboob/tools/browser/browser.py b/weboob/tools/browser/browser.py index af82e584..d0d5931d 100644 --- a/weboob/tools/browser/browser.py +++ b/weboob/tools/browser/browser.py @@ -50,7 +50,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.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserPasswordExpired, BrowserForbidden, BrowserBanned, BrowserHTTPNotFound, BrowserHTTPError, FormFieldConversionWarning from weboob.tools.decorators import retry from weboob.tools.log import getLogger from weboob.tools.mech import ClientForm @@ -100,12 +100,6 @@ class BrokenPageError(Exception): pass -class FormFieldConversionWarning(UserWarning): - """ - A value has been set to a form's field and has been implicitly converted. - """ - - class BasePage(object): """ Base page diff --git a/weboob/tools/exceptions.py b/weboob/tools/exceptions.py index 0d044910..cc8000d8 100644 --- a/weboob/tools/exceptions.py +++ b/weboob/tools/exceptions.py @@ -48,3 +48,9 @@ class BrowserHTTPError(BrowserUnavailable): class ParseError(Exception): pass + + +class FormFieldConversionWarning(UserWarning): + """ + A value has been set to a form's field and has been implicitly converted. + """