nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only load FirefoxCookies as needed

Browse source 
Which is probably never; the feature is unused as far as I know.
This commit is contained in:
Laurent Bachelier 2014-07-10 10:04:25 +02:00
commit d9e04292c4
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
weboob/tools/browser/browser.py
View file

@ -56,16 +56,6 @@ from weboob.tools.mech import ClientForm
ControlNotFoundError = ClientForm.ControlNotFoundError ControlNotFoundError = ClientForm.ControlNotFoundError
from weboob.tools.parsers import get_parser 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', __all__ = ['BrowserIncorrectPassword', 'BrowserForbidden', 'BrowserBanned', 'BrowserUnavailable', 'BrowserRetry',
'BrowserPasswordExpired', 'BrowserHTTPNotFound', 'BrowserHTTPError', 'BrokenPageError', 'BasePage', 'BrowserPasswordExpired', 'BrowserHTTPNotFound', 'BrowserHTTPError', 'BrokenPageError', 'BasePage',
'StandardBrowser', 'BaseBrowser'] 'StandardBrowser', 'BaseBrowser']
@ -192,10 +182,16 @@ class StandardBrowser(mechanize.Browser):
self.set_proxies(proxy) self.set_proxies(proxy)
# Share cookies with firefox # Share cookies with firefox
if firefox_cookies and HAVE_COOKIES: if firefox_cookies:
# Try to load cookies
try:
from .firefox_cookies import FirefoxCookieJar
self._cookie = FirefoxCookieJar(self.DOMAIN, firefox_cookies) self._cookie = FirefoxCookieJar(self.DOMAIN, firefox_cookies)
self._cookie.load() self._cookie.load()
self.set_cookiejar(self._cookie) self.set_cookiejar(self._cookie)
except ImportError as e:
logging.warning("Unable to store Firefox cookies: %s", e)
self._cookie = None
else: else:
self._cookie = None self._cookie = None