Ticket #18494: propagate_unnamed_groups_to_included_urlconfs2.patch

django/core/urlresolvers.py

@@ -309 +309 @@
                     if sub_match:
                         sub_match_dict = dict(match.groupdict(), **self.default_kwargs)
                         sub_match_dict.update(sub_match.kwargs)
-                        return ResolverMatch(sub_match.func, sub_match.args, sub_match_dict, sub_match.url_name, self.app_name or sub_match.app_name, [self.namespace] + sub_match.namespaces)
+                        return ResolverMatch(sub_match.func, tuple([g for i, g in enumerate(match.groups()) if i + 1 not in match.re.groupindex.values()]) + sub_match.args, sub_match_dict, sub_match.url_name, self.app_name or sub_match.app_name, [self.namespace] + sub_match.namespaces)
                     tried.append([pattern])
             raise Resolver404({'tried': tried, 'path': new_path})
         raise Resolver404({'path' : path})

tests/regressiontests/urlpatterns_reverse/namespace_urls.py

@@ -51 +51 @@
 
     (r'^included/', include('regressiontests.urlpatterns_reverse.included_namespace_urls')),
     (r'^inc(?P<outer>\d+)/', include('regressiontests.urlpatterns_reverse.included_urls', namespace='inc-ns5')),
+    (r'^inc(?P<outer>\d+)and(\d+)/', include('regressiontests.urlpatterns_reverse.included_urls', namespace='inc-ns5')),
 
     (r'^ns-outer/(?P<outer>\d+)/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-outer')),
 

tests/regressiontests/urlpatterns_reverse/tests.py

@@ -52 +52 @@
     # Namespaces capturing variables
     ('/inc70/', 'inner-nothing', None, 'inc-ns5', views.empty_view, tuple(), {'outer': '70'}),
     ('/inc78/extra/foobar/', 'inner-extra', None, 'inc-ns5', views.empty_view, tuple(), {'outer':'78', 'extra':'foobar'}),
+    # issue #18494
+    ('/inc79and80/extra/foobar/', 'inner-extra', None, 'inc-ns5', views.empty_view, ('80',), {'outer':'79', 'extra':'foobar'}),
 )
 
 test_data = (