p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #20022: Correctly handle prefixes with url-unsafe characters in reverse().

This commit is contained in:
Baptiste Mispelon 2013-03-13 18:19:29 +01:00
parent 5d8342f321
commit 4fa7f3cdd9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/core/urlresolvers.py
View File

@ -388,7 +388,7 @@ class RegexURLResolver(LocaleRegexProvider):
if len(args) != len(params) + len(prefix_args): if len(args) != len(params) + len(prefix_args):
continue continue
unicode_args = [force_text(val) for val in args] unicode_args = [force_text(val) for val in args]
candidate = (prefix_norm + result) % dict(zip(prefix_args + params, unicode_args)) candidate = (prefix_norm.replace('%', '%%') + result) % dict(zip(prefix_args + params, unicode_args))
else: else:
if set(kwargs.keys()) | set(defaults.keys()) != set(params) | set(defaults.keys()) | set(prefix_args): if set(kwargs.keys()) | set(defaults.keys()) != set(params) | set(defaults.keys()) | set(prefix_args):
continue continue

5
tests/urlpatterns_reverse/tests.py
View File

@ -183,6 +183,11 @@ class URLPatternReverse(TestCase):
self.assertEqual('/bump%2520map/includes/non_path_include/', self.assertEqual('/bump%2520map/includes/non_path_include/',
reverse('non_path_include', prefix='/bump%20map/')) reverse('non_path_include', prefix='/bump%20map/'))
def test_non_urlsafe_prefix_with_args(self):
# Regression for #20022
self.assertEqual('/%7Eme/places/1/',
reverse('places', args=[1], prefix='/~me/'))
class ResolverTests(unittest.TestCase): class ResolverTests(unittest.TestCase):
def test_resolver_repr(self): def test_resolver_repr(self):
""" """