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

StandardBrowser.openurl uses mechanize.Browser.openurl instead of openurl_novisit

Browse source
This commit is contained in:
Romain Bignon 2012-04-13 15:00:12 +02:00
commit 7a619a78d0
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -125,7 +125,7 @@ def check_location(func):
def inner(self, *args, **kwargs): def inner(self, *args, **kwargs):
if args and isinstance(args[0], basestring): if args and isinstance(args[0], basestring):
url = args[0] url = args[0]
if url.startswith('/') and (not self.request or self.request.host != self.DOMAIN): if url.startswith('/') and hasattr(self, 'DOMAIN') and (not self.request or self.request.host != self.DOMAIN):
url = '%s://%s%s' % (self.PROTOCOL, self.DOMAIN, url) url = '%s://%s%s' % (self.PROTOCOL, self.DOMAIN, url)
url = re.sub('(.*)#.*', r'\1', url) url = re.sub('(.*)#.*', r'\1', url)
@ -228,6 +228,9 @@ class StandardBrowser(mechanize.Browser):
def __exit__(self, t, v, tb): def __exit__(self, t, v, tb):
self.lock.release() self.lock.release()
def _openurl(self, *args, **kwargs):
return mechanize.Browser.open(self, *args, **kwargs)
@check_location @check_location
@retry(BrowserHTTPError, tries=3) @retry(BrowserHTTPError, tries=3)
def openurl(self, *args, **kwargs): def openurl(self, *args, **kwargs):
@ -240,18 +243,18 @@ class StandardBrowser(mechanize.Browser):
kwargs['timeout'] = kwargs.get('timeout', self.DEFAULT_TIMEOUT) kwargs['timeout'] = kwargs.get('timeout', self.DEFAULT_TIMEOUT)
try: try:
return mechanize.Browser.open_novisit(self, *args, **kwargs) return self._openurl(*args, **kwargs)
except (mechanize.BrowserStateError, mechanize.response_seek_wrapper, except (mechanize.BrowserStateError, mechanize.response_seek_wrapper,
urllib2.HTTPError, urllib2.URLError, BadStatusLine), e: urllib2.HTTPError, urllib2.URLError, BadStatusLine), e:
if isinstance(e, mechanize.BrowserStateError) and hasattr(self, 'home'): if isinstance(e, mechanize.BrowserStateError) and hasattr(self, 'home'):
self.home() self.home()
return mechanize.Browser.open_novisit(self, *args, **kwargs) return self._openurl(*args, **kwargs)
elif if_fail == 'raise': elif if_fail == 'raise':
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'))
else: else:
return None return None
except BrowserRetry, e: except BrowserRetry, e:
return mechanize.Browser.open_novisit(self, *args, **kwargs) return self._openurl(*args, **kwargs)
def get_exception(self, e): def get_exception(self, e):
if (isinstance(e, urllib2.HTTPError) and hasattr(e, 'getcode') and e.getcode() in (404, 403)) or \ if (isinstance(e, urllib2.HTTPError) and hasattr(e, 'getcode') and e.getcode() in (404, 403)) or \
@ -512,6 +515,9 @@ class BaseBrowser(StandardBrowser):
self.home() self.home()
raise BrowserUnavailable(e) raise BrowserUnavailable(e)
def _openurl(self, *args, **kwargs):
return mechanize.Browser.open_novisit(self, *args, **kwargs)
@check_location @check_location
@retry(BrowserHTTPError, tries=3) @retry(BrowserHTTPError, tries=3)
def location(self, *args, **kwargs): def location(self, *args, **kwargs):