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

retry location after login

Browse source
This commit is contained in:
Romain Bignon 2011-07-02 13:22:25 +02:00
commit cb90621100
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -391,7 +391,8 @@ class BaseBrowser(mechanize.Browser):
self._change_location(mechanize.Browser.open(self, *args, **kwargs), no_login=no_login) self._change_location(mechanize.Browser.open(self, *args, **kwargs), no_login=no_login)
except BrowserRetry: except BrowserRetry:
if not self.page or not args or self.page.url != args[0]: if not self.page or not args or self.page.url != args[0]:
self.location(keep_args, keep_kwargs) keep_kwargs['no_login'] = True
self.location(*keep_args, **keep_kwargs)
except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError, BadStatusLine), e: except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError, BadStatusLine), e:
self.page = None self.page = None
raise self.get_exception(e)('%s (url="%s")' % (e, args and args[0] or 'None')) raise self.get_exception(e)('%s (url="%s")' % (e, args and args[0] or 'None'))
@ -464,7 +465,7 @@ class BaseBrowser(mechanize.Browser):
if not no_login and self.password is not None and not self.is_logged(): if not no_login and self.password is not None and not self.is_logged():
self.logger.debug('!! Relogin !!') self.logger.debug('!! Relogin !!')
self.login() self.login()
return raise BrowserRetry()
if self._cookie: if self._cookie:
self._cookie.save() self._cookie.save()