Ticket #2370: urlresolve.patch

django/conf/urls/defaults.py

@@ -10 +10 @@
 def patterns(prefix, *tuples):
     pattern_list = []
     for t in tuples:
-        if type(t[1]) == list:
-            pattern_list.append(RegexURLResolver(t[0], t[1][0]))
+        reg_ex, view_or_include = t[:2]
+        default_args            = t[2:]
+        if isinstance (view_or_include, list):
+            pattern_list.append(RegexURLResolver(reg_ex, view_or_include[0], * default_args))
         else:
-            pattern_list.append(RegexURLPattern(t[0], prefix and (prefix + '.' + t[1]) or t[1], *t[2:]))
+            pattern_list.append(RegexURLPattern(reg_ex, prefix and (prefix + '.' + view_or_include) or view_or_include, *default_args))
     return pattern_list

django/core/urlresolvers.py

@@ -130 +130 @@
         return reverse_helper(self.regex, *args, **kwargs)
 
 class RegexURLResolver(object):
-    def __init__(self, regex, urlconf_name):
+    def __init__(self, regex, urlconf_name, default_args=None):
         # regex is a string representing a regular expression.
         # urlconf_name is a string representing the module containing urlconfs.
         self.regex = re.compile(regex)
         self.urlconf_name = urlconf_name
         self.callback = None
+        self.default_args = default_args or {}
 
     def resolve(self, path):
         tried = []
@@ -149 +150 @@
                     tried.extend([(pattern.regex.pattern + '   ' + t) for t in e.args[0]['tried']])
                 else:
                     if sub_match:
-                        return sub_match[0], sub_match[1], dict(match.groupdict(), **sub_match[2])
+                        sub_match_dict = dict (self.default_args, **sub_match[2])
+                        return sub_match[0], sub_match[1], dict(match.groupdict(), **sub_match_dict)
                     tried.append(pattern.regex.pattern)
             raise Resolver404, {'tried': tried, 'path': new_path}