Ticket #15900: 15900_normalize_namespace_prefixes_on_reverse.2.diff

File 15900_normalize_namespace_prefixes_on_reverse.2.diff, 5.6 KB (added by dmclain, 4 years ago)

Adding a resolve test for variable capturing namespaced paths

  • django/core/urlresolvers.py

    diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
    index 52d9090..0db5f11 100644
    a b class RegexURLResolver(object): 
    302302    def resolve500(self):
    303303        return self._resolve_special('500')
    304304
    305     def reverse(self, lookup_view, *args, **kwargs):
     305    def reverse(self, lookup_view, *args, **kwargs):   
     306        prefix = kwargs.pop('__DJANGO_REVERSE_PREFIX','')
    306307        if args and kwargs:
    307308            raise ValueError("Don't mix *args and **kwargs in call to reverse()!")
    308309        try:
    class RegexURLResolver(object): 
    310311        except (ImportError, AttributeError), e:
    311312            raise NoReverseMatch("Error importing '%s': %s." % (lookup_view, e))
    312313        possibilities = self.reverse_dict.getlist(lookup_view)
     314        prefix_norm, prefix_args = normalize(prefix)[0]
    313315        for possibility, pattern in possibilities:
    314316            for result, params in possibility:
    315317                if args:
    316                     if len(args) != len(params):
     318                    if len(args) != len(params) + len(prefix_args):
    317319                        continue
    318320                    unicode_args = [force_unicode(val) for val in args]
    319                     candidate =  result % dict(zip(params, unicode_args))
     321                    candidate =  (prefix_norm + result) % dict(zip(params, unicode_args))
    320322                else:
    321                     if set(kwargs.keys()) != set(params):
     323                    if set(kwargs.keys()) != (set(params)|set(prefix_args)):
    322324                        continue
    323325                    unicode_kwargs = dict([(k, force_unicode(v)) for (k, v) in kwargs.items()])
    324                     candidate = result % unicode_kwargs
    325                 if re.search(u'^%s' % pattern, candidate, re.UNICODE):
     326                    candidate = (prefix_norm + result) % unicode_kwargs
     327                if re.search(u'^%s%s' % (prefix, pattern), candidate, re.UNICODE):
    326328                    return candidate
    327329        # lookup_view can be URL label, or dotted path, or callable, Any of
    328330        # these can be passed in at the top, but callables are not friendly in
    def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None, current 
    386388                    raise NoReverseMatch("%s is not a registered namespace inside '%s'" % (key, ':'.join(resolved_path)))
    387389                else:
    388390                    raise NoReverseMatch("%s is not a registered namespace" % key)
    389 
    390     return iri_to_uri(u'%s%s' % (prefix, resolver.reverse(view,
    391             *args, **kwargs)))
     391    kwargs['__DJANGO_REVERSE_PREFIX'] = prefix
     392    return iri_to_uri(resolver.reverse(view, *args, **kwargs))
    392393
    393394reverse_lazy = lazy(reverse, str)
    394395
  • tests/regressiontests/urlpatterns_reverse/namespace_urls.py

    diff --git a/tests/regressiontests/urlpatterns_reverse/namespace_urls.py b/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
    index 3d34049..0544e75 100644
    a b urlpatterns = patterns('regressiontests.urlpatterns_reverse.views', 
    3737    (r'^default/', include(default_testobj.urls)),
    3838
    3939    (r'^other1/', include(otherobj1.urls)),
    40     (r'^other2/', include(otherobj2.urls)),
     40    (r'^other[246]/', include(otherobj2.urls)),
    4141
    42     (r'^ns-included1/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')),
     42    (r'^ns-included[135]/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')),
    4343    (r'^ns-included2/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')),
    4444
    4545    (r'^included/', include('regressiontests.urlpatterns_reverse.included_namespace_urls')),
     46    (r'^inc(?P<outer>\d+)/', include('regressiontests.urlpatterns_reverse.included_urls', namespace='inc-ns5')),
    4647
    4748)
  • tests/regressiontests/urlpatterns_reverse/tests.py

    diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py
    index 4f391d9..71e1913 100644
    a b resolve_test_data = ( 
    4949    # Nested namespaces
    5050    ('/ns-included1/test3/inner/42/37/', 'urlobject-view', 'testapp', 'inc-ns1:test-ns3', 'empty_view', tuple(), {'arg1': '42', 'arg2': '37'}),
    5151    ('/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'}),
     52
     53    # Namespaces capturing variables
     54    ('/inc70/', 'inner-nothing', None, 'inc-ns5', views.empty_view, tuple(), {'outer': '70'}),
     55    ('/inc78/extra/foobar/', 'inner-extra', None, 'inc-ns5', views.empty_view, tuple(), {'outer':'78', 'extra':'foobar'}),
     56   
    5257)
    5358
    5459test_data = (
    class NamespaceTests(TestCase): 
    335340        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]))
    336341        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}))
    337342
     343    def test_nested_namespace_with_variable(self):
     344        self.assertEqual('/inc54/', reverse('inc-ns5:inner-nothing', kwargs={'outer':'54'}))
     345        self.assertEqual('/inc78/extra/foobar/', reverse('inc-ns5:inner-extra', kwargs={'outer':'78', 'extra':'foobar'}))
     346
    338347    def test_app_lookup_object(self):
    339348        "A default application namespace can be used for lookup"
    340349        self.assertEqual('/default/inner/', reverse('testapp:urlobject-view'))
Back to Top