From 463fdb2016a74c23f7e71472b1893e0938ec8211 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Sat, 22 Mar 2014 02:31:25 +0100 Subject: [PATCH] Fix passing the URL with id2url, when provided with an URL It was passing the match result instead. --- weboob/tools/browser2/page.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/weboob/tools/browser2/page.py b/weboob/tools/browser2/page.py index 0015159b..3fe9449b 100644 --- a/weboob/tools/browser2/page.py +++ b/weboob/tools/browser2/page.py @@ -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