From d9e04292c40092121dbcfadd6e77ba339dde9c50 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Thu, 10 Jul 2014 10:04:25 +0200 Subject: [PATCH] Only load FirefoxCookies as needed Which is probably never; the feature is unused as far as I know. --- weboob/tools/browser/browser.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/weboob/tools/browser/browser.py b/weboob/tools/browser/browser.py index ca575d54..d027605a 100644 --- a/weboob/tools/browser/browser.py +++ b/weboob/tools/browser/browser.py @@ -56,16 +56,6 @@ from weboob.tools.mech import ClientForm ControlNotFoundError = ClientForm.ControlNotFoundError from weboob.tools.parsers import get_parser -# Try to load cookies -try: - from .firefox_cookies import FirefoxCookieJar -except ImportError as e: - logging.warning("Unable to store cookies: %s", e) - HAVE_COOKIES = False -else: - HAVE_COOKIES = True - - __all__ = ['BrowserIncorrectPassword', 'BrowserForbidden', 'BrowserBanned', 'BrowserUnavailable', 'BrowserRetry', 'BrowserPasswordExpired', 'BrowserHTTPNotFound', 'BrowserHTTPError', 'BrokenPageError', 'BasePage', 'StandardBrowser', 'BaseBrowser'] @@ -192,10 +182,16 @@ class StandardBrowser(mechanize.Browser): self.set_proxies(proxy) # Share cookies with firefox - if firefox_cookies and HAVE_COOKIES: - self._cookie = FirefoxCookieJar(self.DOMAIN, firefox_cookies) - self._cookie.load() - self.set_cookiejar(self._cookie) + if firefox_cookies: + # Try to load cookies + try: + from .firefox_cookies import FirefoxCookieJar + self._cookie = FirefoxCookieJar(self.DOMAIN, firefox_cookies) + self._cookie.load() + self.set_cookiejar(self._cookie) + except ImportError as e: + logging.warning("Unable to store Firefox cookies: %s", e) + self._cookie = None else: self._cookie = None