Ticket #17914: 17914.patch

tests/regressiontests/urlpatterns_reverse/views.py

@@ -26 +26 @@
         return HttpResponse('')
 
 view_class_instance = ViewClass()
+view_class_instance2 = ViewClass()
 
 class LazyRedirectView(RedirectView):
     url = reverse_lazy('named-lazy-url-redirected-to')

tests/regressiontests/urlpatterns_reverse/namespace_urls.py

@@ -54 +54 @@
 
     (r'^ns-outer/(?P<outer>\d+)/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-outer')),
 
-    (r'^\+\\\$\*/', include('regressiontests.urlpatterns_reverse.namespace_urls', namespace='special')),
+    (r'^\+\\\$\*/included/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='special')),
 )

tests/regressiontests/urlpatterns_reverse/tests.py

@@ -47 +47 @@
 
     # Nested namespaces
     ('/ns-included1/test3/inner/42/37/', 'urlobject-view', 'testapp', 'inc-ns1:test-ns3', 'empty_view', tuple(), {'arg1': '42', 'arg2': '37'}),
-    ('/ns-included1/ns-included4/ns-included2/test3/inner/42/37/', 'urlobject-view', 'testapp', 'inc-ns1:inc-ns4:inc-ns2:test-ns3', 'empty_view', tuple(), {'arg1': '42', 'arg2': '37'}),
 
     # Namespaces capturing variables
     ('/inc70/', 'inner-nothing', None, 'inc-ns5', views.empty_view, tuple(), {'outer': '70'}),
@@ -278 +277 @@
 class NamespaceTests(TestCase):
     urls = 'regressiontests.urlpatterns_reverse.namespace_urls'
 
+    def test_function_reference(self):
+        self.assertEqual(reverse(views.view_class_instance2), '/+%5C$*/included/view_class/level2/')
+
     def test_ambiguous_object(self):
         "Names deployed via dynamic URL objects that require namespaces can't be resolved"
         self.assertRaises(NoReverseMatch, reverse, 'urlobject-view')
@@ -346 +348 @@
         self.assertEqual('/ns-included1/test3/inner/42/37/', reverse('inc-ns1:test-ns3:urlobject-view', kwargs={'arg1':42, 'arg2':37}))
         self.assertEqual('/ns-included1/test3/inner/+%5C$*/', reverse('inc-ns1:test-ns3:urlobject-special-view'))
 
-    def test_nested_namespace_pattern(self):
-        "Namespaces can be nested"
-        self.assertEqual('/ns-included1/ns-included4/ns-included1/test3/inner/', reverse('inc-ns1:inc-ns4:inc-ns1:test-ns3:urlobject-view'))
-        self.assertEqual('/ns-included1/ns-included4/ns-included1/test3/inner/37/42/', reverse('inc-ns1:inc-ns4:inc-ns1:test-ns3:urlobject-view', args=[37,42]))
-        self.assertEqual('/ns-included1/ns-included4/ns-included1/test3/inner/42/37/', reverse('inc-ns1:inc-ns4:inc-ns1:test-ns3:urlobject-view', kwargs={'arg1':42, 'arg2':37}))
-        self.assertEqual('/ns-included1/ns-included4/ns-included1/test3/inner/+%5C$*/', reverse('inc-ns1:inc-ns4:inc-ns1:test-ns3:urlobject-special-view'))
-
     def test_app_lookup_object(self):
         "A default application namespace can be used for lookup"
         self.assertEqual('/default/inner/', reverse('testapp:urlobject-view'))

tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py

@@ -3 +3 @@
 from django.conf.urls import patterns, url, include
 
 from .namespace_urls import URLObject
-from .views import view_class_instance
+from .views import view_class_instance, view_class_instance2
 
 
 testobj3 = URLObject('testapp', 'test-ns3')
 
+level2_patterns = patterns("",
+    (r'^level2/$', view_class_instance2)
+)
+
 urlpatterns = patterns('regressiontests.urlpatterns_reverse.views',
     url(r'^normal/$', 'empty_view', name='inc-normal-view'),
     url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-normal-view'),
@@ -18 +22 @@
     url(r'^no_kwargs/(\d+)/(\d+)/$', 'empty_view', name='inc-no-kwargs'),
 
     url(r'^view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', view_class_instance, name='inc-view-class'),
+    url(r'^view_class/', include(level2_patterns)),
 
     (r'^test3/', include(testobj3.urls)),
     (r'^ns-included3/', include('regressiontests.urlpatterns_reverse.included_urls', namespace='inc-ns3')),
-    (r'^ns-included4/', include('regressiontests.urlpatterns_reverse.namespace_urls', namespace='inc-ns4')),
 )
 

django/core/urlresolvers.py

@@ -7 +7 @@
     (view_function, function_args, function_kwargs)
 """
 
+from itertools import ifilter
 import re
 from threading import local
 
@@ -248 +249 @@
                     namespaces[pattern.namespace] = (p_pattern, pattern)
                     if pattern.app_name:
                         apps.setdefault(pattern.app_name, []).append(pattern.namespace)
+                    # Since a namespace has been provided for the included resolver,
+                    # we can rely on urlresolvers.reverse() to traverse the tree
+                    # to honor and find the correct resolver to finally be able to
+                    # call resolver.reverse(name).
+                    # However when reversing a callable, no namespace information
+                    # is attached to the callable so all lookups for all descendant
+                    # views functions *must* be included in each resolver.
+                    include_lookups = ifilter(callable, pattern.reverse_dict)
                 else:
-                    parent = normalize(pattern.regex.pattern)
-                    for name in pattern.reverse_dict:
-                        for matches, pat, defaults 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])
-                            lookups.appendlist(name, (new_matches, p_pattern + pat, dict(defaults, **pattern.default_kwargs)))
                     for namespace, (prefix, sub_pattern) in pattern.namespace_dict.items():
                         namespaces[namespace] = (p_pattern + prefix, sub_pattern)
                     for app_name, namespace_list in pattern.app_dict.items():
                         apps.setdefault(app_name, []).extend(namespace_list)
+                    # When no namespace is provided, *all* the patterns in the
+                    # included resolver should be available in this resolver.
+                    include_lookups = iter(pattern.reverse_dict)
+                # Add each of the child lookups to this resolver, being careful
+                # to add appropriate URL and regex prefixes so reversing results
+                # are correct.
+                parent = normalize(pattern.regex.pattern)
+                for name in include_lookups:
+                    for matches, pat, defaults 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])
+                        lookups.appendlist(name, (new_matches, p_pattern + pat, dict(defaults, **pattern.default_kwargs)))
             else:
                 bits = normalize(p_pattern)
                 lookups.appendlist(pattern.callback, (bits, p_pattern, pattern.default_args))