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

add BaseBrowser.get_page method (from _change_location) to get Page object from a result buffer without changing location

Browse source
This commit is contained in:
Romain Bignon 2015-02-25 17:39:17 +01:00
commit 7df61bc6cb
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
weboob/deprecated/browser/browser.py
View file

@ -628,12 +628,7 @@ class Browser(StandardBrowser):
response.set_data(data) response.set_data(data)
mechanize.Browser._set_response(self, response, *args, **kwargs) mechanize.Browser._set_response(self, response, *args, **kwargs)
def _change_location(self, result, no_login=False): def get_page(self, result):
"""
This function is called when we have moved to a page, to load a Page
object.
"""
# Find page from url # Find page from url
pageCls = None pageCls = None
parser = None parser = None
@ -663,19 +658,26 @@ class Browser(StandardBrowser):
# Not found # Not found
if not pageCls: if not pageCls:
self.page = None self.page = None
self.logger.warning('There isn\'t any page corresponding to URL %s' % result.geturl()) self.logger.warning('There isn\'t any page corresponding to URL %s', result.geturl())
self.save_response(result, warning=True) self.save_response(result, warning=True)
return return
self.logger.debug('[user_id=%s] Went on %s' % (self.username, result.geturl())) self.logger.debug('[user_id=%s] Went on %s', self.username, result.geturl())
self.last_update = time.time() self.last_update = time.time()
if self.logger.settings['save_responses']: if self.logger.settings['save_responses']:
self.save_response(result) self.save_response(result)
document = self.get_document(result, parser, encoding=pageCls.ENCODING) document = self.get_document(result, parser, encoding=pageCls.ENCODING)
self.page = pageCls(self, document, result.geturl(), groups=page_groups, group_dict=page_group_dict, logger=self.logger) return pageCls(self, document, result.geturl(), groups=page_groups, group_dict=page_group_dict, logger=self.logger)
def _change_location(self, result, no_login=False):
"""
This function is called when we have moved to a page, to load a Page
object.
"""
self.page = self.get_page(result)
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()