From 7a619a78d00c6979d6e7d2e0d839b215d4114327 Mon Sep 17 00:00:00 2001
From: Romain Bignon <romain@symlink.me>
Date: Fri, 13 Apr 2012 15:00:12 +0200
Subject: [PATCH] StandardBrowser.openurl uses mechanize.Browser.openurl
 instead of openurl_novisit

---
 weboob/tools/browser/browser.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/weboob/tools/browser/browser.py b/weboob/tools/browser/browser.py
index 9d50cbb3..c5bb002c 100644
--- a/weboob/tools/browser/browser.py
+++ b/weboob/tools/browser/browser.py
@@ -125,7 +125,7 @@ def check_location(func):
     def inner(self, *args, **kwargs):
         if args and isinstance(args[0], basestring):
             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 = re.sub('(.*)#.*', r'\1', url)
 
@@ -228,6 +228,9 @@ class StandardBrowser(mechanize.Browser):
     def __exit__(self, t, v, tb):
         self.lock.release()
 
+    def _openurl(self, *args, **kwargs):
+        return mechanize.Browser.open(self, *args, **kwargs)
+
     @check_location
     @retry(BrowserHTTPError, tries=3)
     def openurl(self, *args, **kwargs):
@@ -240,18 +243,18 @@ class StandardBrowser(mechanize.Browser):
         kwargs['timeout'] = kwargs.get('timeout', self.DEFAULT_TIMEOUT)
 
         try:
-            return mechanize.Browser.open_novisit(self, *args, **kwargs)
+            return self._openurl(*args, **kwargs)
         except (mechanize.BrowserStateError, mechanize.response_seek_wrapper,
                 urllib2.HTTPError, urllib2.URLError, BadStatusLine), e:
             if isinstance(e, mechanize.BrowserStateError) and hasattr(self, 'home'):
                 self.home()
-                return mechanize.Browser.open_novisit(self, *args, **kwargs)
+                return self._openurl(*args, **kwargs)
             elif if_fail == 'raise':
                 raise self.get_exception(e)('%s (url="%s")' % (e, args and args[0] or 'None'))
             else:
                 return None
         except BrowserRetry, e:
-            return mechanize.Browser.open_novisit(self, *args, **kwargs)
+            return self._openurl(*args, **kwargs)
 
     def get_exception(self, e):
         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()
             raise BrowserUnavailable(e)
 
+    def _openurl(self, *args, **kwargs):
+        return mechanize.Browser.open_novisit(self, *args, **kwargs)
+
     @check_location
     @retry(BrowserHTTPError, tries=3)
     def location(self, *args, **kwargs):