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

Fix passing the URL with id2url, when provided with an URL

Browse source 
It was passing the match result instead.
This commit is contained in:
Laurent Bachelier 2014-03-22 02:31:25 +01:00 • committed by Romain Bignon
commit 463fdb2016
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
weboob/tools/browser2/page.py
View file

@ -147,15 +147,14 @@ class URL(object):
return self.klass(self.browser, response, m.groupdict())
def id2url(self, func):
def inner(browser, _id, *args, **kwargs):
if re.match('^https?://.*', _id):
_id = self.match(_id, browser.BASEURL)
if _id is None:
def inner(browser, id_or_url, *args, **kwargs):
if re.match('^https?://.*', id_or_url):
if not self.match(id_or_url, browser.BASEURL):
return
else:
id_or_url = self.build(id=id_or_url)
url = self.build(id=_id)
return func(browser, url, *args, **kwargs)
return func(browser, id_or_url, *args, **kwargs)
return inner