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

Only use full-name substitutions, to allow % in URLs

Browse source
This commit is contained in:
Laurent Bachelier 2014-05-16 11:39:27 +02:00
commit 6e9910ae9a
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,9 +143,14 @@ class URL(object):
patterns += normalize(url) patterns += normalize(url)
for pattern, _ in patterns: for pattern, _ in patterns:
try: url = pattern
url = pattern % kwargs # only use full-name substitutions, to allow % in URLs
except KeyError: for kwkey in kwargs:
search = '%%(%s)s' % kwkey
if search in pattern:
url = url.replace(search, unicode(kwargs[kwkey]))
# if there are named substitutions left, ignore pattern
if re.search('%\([A-z_]+\)s', url):
continue continue
return self.browser.absurl(url, base=True) return self.browser.absurl(url, base=True)