summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--django/core/urlresolvers.py8
2 files changed, 6 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 0ed198ec92..90e52c7d0c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -393,6 +393,7 @@ answer newbie questions, and generally made Django that much better:
Frank Tegtmeyer <fte@fte.to>
Marcel Telka <marcel@telka.sk>
Terry Huang <terryh.tp@gmail.com>
+ Travis Terry <tdterry7@gmail.com>
thebjorn <bp@datakortet.no>
Zach Thompson <zthompson47@gmail.com>
Michael Thornhill
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index 774e6d3b42..c61cdde65a 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -152,6 +152,7 @@ class RegexURLResolver(object):
def _get_reverse_dict(self):
if not self._reverse_dict and hasattr(self.urlconf_module, 'urlpatterns'):
+ lookups = MultiValueDict()
for pattern in reversed(self.urlconf_module.urlpatterns):
p_pattern = pattern.regex.pattern
if p_pattern.startswith('^'):
@@ -163,11 +164,12 @@ class RegexURLResolver(object):
new_matches = []
for piece, p_args in parent:
new_matches.extend([(piece + suffix, p_args + args) for (suffix, args) in matches])
- self._reverse_dict.appendlist(name, (new_matches, p_pattern + pat))
+ lookups.appendlist(name, (new_matches, p_pattern + pat))
else:
bits = normalize(p_pattern)
- self._reverse_dict.appendlist(pattern.callback, (bits, p_pattern))
- self._reverse_dict.appendlist(pattern.name, (bits, p_pattern))
+ lookups.appendlist(pattern.callback, (bits, p_pattern))
+ lookups.appendlist(pattern.name, (bits, p_pattern))
+ self._reverse_dict = lookups
return self._reverse_dict
reverse_dict = property(_get_reverse_dict)