Ticket #2025: reverse_url_lookup.patch

urlresolvers.py

@@ -23 +23 @@
     dot = callback.rindex('.')
     return callback[:dot], callback[dot+1:]
 
+def reverse_helper(regex, *args, **kwargs):
+    """
+    Does a "reverse" lookup -- returns the URL for the given args/kwargs.
+    The args/kwargs are applied to the regular expression in this
+    RegexURLPattern. For example:
+
+        >>> RegexURLPattern('^places/(\d+)/$').reverse_helper(3)
+        'places/3/'
+        >>> RegexURLPattern('^places/(?P<id>\d+)/$').reverse_helper(id=3)
+        'places/3/'
+        >>> RegexURLPattern('^people/(?P<state>\w\w)/(\w+)/$').reverse_helper('adrian', state='il')
+        'people/il/adrian/'
+
+    Raises NoReverseMatch if the args/kwargs aren't valid for the RegexURLPattern.
+    """
+    # TODO: Handle nested parenthesis in the following regex.
+    result = re.sub(r'\(([^)]+)\)', MatchChecker(args, kwargs), regex.pattern)
+    return result.replace('^', '').replace('$', '')
+
 class MatchChecker(object):
     "Class used in reverse RegexURLPattern lookup."
     def __init__(self, args, kwargs):
@@ -108 +127 @@
         return self.reverse_helper(*args, **kwargs)
 
     def reverse_helper(self, *args, **kwargs):
-        """
-        Does a "reverse" lookup -- returns the URL for the given args/kwargs.
-        The args/kwargs are applied to the regular expression in this
-        RegexURLPattern. For example:
+        return reverse_helper(self.regex, *args, **kwargs)
 
-            >>> RegexURLPattern('^places/(\d+)/$').reverse_helper(3)
-            'places/3/'
-            >>> RegexURLPattern('^places/(?P<id>\d+)/$').reverse_helper(id=3) 
-            'places/3/'
-            >>> RegexURLPattern('^people/(?P<state>\w\w)/(\w+)/$').reverse_helper('adrian', state='il')
-            'people/il/adrian/'
-
-        Raises NoReverseMatch if the args/kwargs aren't valid for the RegexURLPattern.
-        """
-        # TODO: Handle nested parenthesis in the following regex.
-        result = re.sub(r'\(([^)]+)\)', MatchChecker(args, kwargs), self.regex.pattern)
-        return result.replace('^', '').replace('$', '')
-
 class RegexURLResolver(object):
     def __init__(self, regex, urlconf_name):
         # regex is a string representing a regular expression.
@@ -180 +183 @@
     def resolve500(self):
         return self._resolve_special('500')
 
+    def reverse_helper(self, viewname, *args, **kwargs):
+        try:
+            sub_match = self.reverse(viewname, *args, **kwargs)
+            result = reverse_helper(self.regex, *args, **kwargs)
+            return result + sub_match
+        except NoReverseMatch:
+            raise NoReverseMatch
+
     def reverse(self, viewname, *args, **kwargs):
         for pattern in self.urlconf_module.urlpatterns:
-            if pattern.callback == viewname:
+            if isinstance(pattern, RegexURLResolver):
                 try:
+                    return pattern.reverse_helper(viewname, *args, **kwargs)
+                except NoReverseMatch:
+                    continue
+            elif pattern.callback == viewname:
+                try:
                     return pattern.reverse_helper(*args, **kwargs)
                 except NoReverseMatch:
                     continue