Ticket #2615: url_resolve.diff

core/urlresolvers.py

@@ -17 +17 @@
 class NoReverseMatch(Exception):
     pass
 
+class ReversedMatch:
+    """
+    url is te resulting url
+    matched_args is a list with matched named args
+    default_args a hash, with the associated default args
+    """
+    def __init__(self, url , matched_kwargs , default_args):
+        self.url = url
+        self.matched_kwargs = matched_kwargs
+        self.default_args = default_args
+            
+    def __add__(self , other):
+        new_default_args = self.default_args.copy() 
+        new_default_args.update(other.default_args)
+        return ReversedMatch(self.url + other.url , self.matched_kwargs + other.matched_kwargs , new_default_args)
+    
+    def get_unmatched_kwargs(self, kwargs):
+        return dict([(k, v) for k , v in kwargs.items() if not k in self.matched_kwargs])
+    
+    def get_default_args(self):
+        return self.default_args
+    
+    def get_url(self):
+        return '/' + self.url
+
 def get_mod_func(callback):
     # Converts 'django.views.news.stories.story_detail' to
     # ['django.views.news.stories', 'story_detail']
     dot = callback.rindex('.')
     return callback[:dot], callback[dot+1:]
 
-def reverse_helper(regex, *args, **kwargs):
+def reverse_helper(regex, args, kwargs, default_args = None):
     """
     Does a "reverse" lookup -- returns the URL for the given args/kwargs.
     The args/kwargs are applied to the given compiled regular expression.
@@ -38 +63 @@
 
     Raises NoReverseMatch if the args/kwargs aren't valid for the regex.
     """
+   
     # TODO: Handle nested parenthesis in the following regex.
-    result = re.sub(r'\(([^)]+)\)', MatchChecker(args, kwargs), regex.pattern)
-    return result.replace('^', '').replace('$', '')
+    match_checker = MatchChecker(args, kwargs)
+    result = re.sub(r'\(([^)]+)\)', match_checker, regex.pattern)
+    
+    matched_kwargs = match_checker.matched_kwargs
+    url = result.replace('^', '').replace('$', '')
+    return ReversedMatch(url , matched_kwargs , default_args or {})
 
 class MatchChecker(object):
     "Class used in reverse RegexURLPattern lookup."
     def __init__(self, args, kwargs):
         self.args, self.kwargs = args, kwargs
         self.current_arg = 0
+        self.matched_kwargs = []
 
     def __call__(self, match_obj):
         # match_obj.group(1) is the contents of the parenthesis.
@@ -59 +90 @@
             # m.group(2) is the regex.
             try:
                 value = self.kwargs[m.group(1)]
+                self.matched_kwargs.append(m.group(1))
             except KeyError:
                 # It was a named group, but the arg was passed in as a
                 # positional arg or not at all.
@@ -96 +128 @@
             self._callback = None
             self._callback_str = callback
         self.default_args = default_args or {}
-
+        
     def resolve(self, path):
         match = self.regex.search(path)
         if match:
@@ -109 +141 @@
             if not kwargs:
                 args = match.groups()
             # In both cases, pass any extra_kwargs as **kwargs.
-            kwargs.update(self.default_args)
-
+            kwargs.update(self.default_args)            
             return self.callback, args, kwargs
 
     def _get_callback(self):
@@ -134 +165 @@
             raise NoReverseMatch
         if lookup_view != self.callback:
             raise NoReverseMatch
-        return self.reverse_helper(*args, **kwargs)
+        return self.reverse_helper(args, kwargs)
 
-    def reverse_helper(self, *args, **kwargs):
-        return reverse_helper(self.regex, *args, **kwargs)
+    def reverse_helper(self, args, kwargs , default_args = {}):
+        # default_args from parrent need to be taken into account
+        default_args.update(self.default_args)
+        return reverse_helper(self.regex, args, kwargs, default_args)
 
 class RegexURLResolver(object):
     def __init__(self, regex, urlconf_name, default_kwargs=None):
@@ -147 +180 @@
         self.urlconf_name = urlconf_name
         self.callback = None
         self.default_kwargs = default_kwargs or {}
-
+                
     def resolve(self, path):
         tried = []
         match = self.regex.search(path)
@@ -210 +243 @@
                     continue
             elif pattern.callback == lookup_view:
                 try:
-                    return pattern.reverse_helper(*args, **kwargs)
+                    return pattern.reverse_helper(args, kwargs , self.default_kwargs)
                 except NoReverseMatch:
                     continue
         raise NoReverseMatch
 
     def reverse_helper(self, lookup_view, *args, **kwargs):
         sub_match = self.reverse(lookup_view, *args, **kwargs)
-        result = reverse_helper(self.regex, *args, **kwargs)
+        result = reverse_helper(self.regex, args, kwargs , sub_match.default_args)
         return result + sub_match
 
 def resolve(path, urlconf=None):
@@ -227 +260 @@
     resolver = RegexURLResolver(r'^/', urlconf)
     return resolver.resolve(path)
 
-def reverse(viewname, urlconf=None, args=None, kwargs=None):
+def reverse_match(viewname, urlconf=None, args=None, kwargs=None):
     args = args or []
     kwargs = kwargs or {}
     if urlconf is None:
         from django.conf import settings
         urlconf = settings.ROOT_URLCONF
     resolver = RegexURLResolver(r'^/', urlconf)
-    return '/' + resolver.reverse(viewname, *args, **kwargs)
+    return resolver.reverse(viewname, *args, **kwargs)
+
+def reverse(viewname, urlconf=None, args=None, kwargs=None):        
+    return '/' + reverse_match(viewname, urlconf, args, kwargs).url