summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/core/urlresolvers.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index 5b62b88578..774e6d3b42 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -158,12 +158,12 @@ class RegexURLResolver(object):
p_pattern = p_pattern[1:]
if isinstance(pattern, RegexURLResolver):
parent = normalize(pattern.regex.pattern)
- for name, (matches, pat) in pattern.reverse_dict.iteritems():
- 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))
+ for name in pattern.reverse_dict:
+ for matches, pat in pattern.reverse_dict.getlist(name):
+ 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))
else:
bits = normalize(p_pattern)
self._reverse_dict.appendlist(pattern.callback, (bits, p_pattern))