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

fix change_location calls

Browse source
This commit is contained in:
Romain Bignon 2010-03-23 23:45:43 +01:00
commit 123e16b563
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
weboob/tools/browser.py
View file

@ -62,7 +62,7 @@ class BasePage:
class StandardParser(html5lib.HTMLParser): class StandardParser(html5lib.HTMLParser):
def __init__(self): def __init__(self):
html5lib.HTMLParser.__init__(tree=treebuilders.getTreeBuilder("dom")) html5lib.HTMLParser.__init__(self, tree=treebuilders.getTreeBuilder("dom"))
def parse(self, data): def parse(self, data):
return html5lib.HTMLParser.parse(data, encoding='iso-8859-1') return html5lib.HTMLParser.parse(data, encoding='iso-8859-1')
@ -154,7 +154,7 @@ class Browser(mechanize.Browser):
def submit(self, *args, **kwargs): def submit(self, *args, **kwargs):
try: try:
self.__changeLocation(mechanize.Browser.submit(self, *args, **kwargs)) self.__change_location(mechanize.Browser.submit(self, *args, **kwargs))
except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e: except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e:
error(e) error(e)
self.page = None self.page = None
@ -168,7 +168,7 @@ class Browser(mechanize.Browser):
def follow_link(self, *args, **kwargs): def follow_link(self, *args, **kwargs):
try: try:
self.__changeLocation(mechanize.Browser.follow_link(self, *args, **kwargs)) self.__change_location(mechanize.Browser.follow_link(self, *args, **kwargs))
except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e: except (mechanize.response_seek_wrapper, urllib2.HTTPError, urllib2.URLError), e:
error(e) error(e)
self.page = None self.page = None
@ -183,7 +183,7 @@ class Browser(mechanize.Browser):
keep_kwargs = kwargs.copy() keep_kwargs = kwargs.copy()
try: try:
self.__changeLocation(mechanize.Browser.open(self, *args, **kwargs)) self.__change_location(mechanize.Browser.open(self, *args, **kwargs))
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) self.location(keep_args, keep_kwargs)
@ -218,7 +218,7 @@ class Browser(mechanize.Browser):
print '[%s] Gone on %s' % (self.username, result.geturl()) print '[%s] Gone on %s' % (self.username, result.geturl())
self.last_update = time.time() self.last_update = time.time()
document = self.__parser.parse() document = self.__parser.parse(result)
self.page = pageCls(self, document, result.geturl()) self.page = pageCls(self, document, result.geturl())
self.page.loaded() self.page.loaded()