Ticket #15900: 15900_normalize_namespace_prefixes_on_reverse.4.diff

File 15900_normalize_namespace_prefixes_on_reverse.4.diff, 4.9 KB (added by dmclain, 8 years ago)
  • django/core/urlresolvers.py

    diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
    index 424886e..54d6177 100644
    a b class RegexURLResolver(object): 
    303303        return self._resolve_special('500')
    304304
    305305    def reverse(self, lookup_view, *args, **kwargs):
     306        return self._reverse_with_prefix(lookup_view, '', *args, **kwargs)
     307       
     308    def _reverse_with_prefix(self, lookup_view, _prefix, *args, **kwargs):
    306309        if args and kwargs:
    307310            raise ValueError("Don't mix *args and **kwargs in call to reverse()!")
    308311        try:
    class RegexURLResolver(object): 
    310313        except (ImportError, AttributeError), e:
    311314            raise NoReverseMatch("Error importing '%s': %s." % (lookup_view, e))
    312315        possibilities = self.reverse_dict.getlist(lookup_view)
     316        prefix_norm, prefix_args = normalize(_prefix)[0]
    313317        for possibility, pattern, defaults in possibilities:
    314318            for result, params in possibility:
    315319                if args:
    316                     if len(args) != len(params):
     320                    if len(args) != len(params) + len(prefix_args):
    317321                        continue
    318322                    unicode_args = [force_unicode(val) for val in args]
    319                     candidate =  result % dict(zip(params, unicode_args))
     323                    candidate =  (prefix_norm + result) % dict(zip(params, unicode_args))
    320324                else:
    321                     if set(kwargs.keys() + defaults.keys()) != set(params + defaults.keys()):
     325                    if set(kwargs.keys() + defaults.keys()) != set(params + defaults.keys() + prefix_args):
    322326                        continue
    323327                    matches = True
    324328                    for k, v in defaults.items():
    class RegexURLResolver(object): 
    328332                    if not matches:
    329333                        continue
    330334                    unicode_kwargs = dict([(k, force_unicode(v)) for (k, v) in kwargs.items()])
    331                     candidate = result % unicode_kwargs
    332                 if re.search(u'^%s' % pattern, candidate, re.UNICODE):
     335                    candidate = (prefix_norm + result) % unicode_kwargs
     336                if re.search(u'^%s%s' % (_prefix, pattern), candidate, re.UNICODE):
    333337                    return candidate
    334338        # lookup_view can be URL label, or dotted path, or callable, Any of
    335339        # 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 
    394398                else:
    395399                    raise NoReverseMatch("%s is not a registered namespace" % key)
    396400
    397     return iri_to_uri(u'%s%s' % (prefix, resolver.reverse(view,
    398             *args, **kwargs)))
     401    return iri_to_uri(resolver._reverse_with_prefix(view, prefix, *args, **kwargs))
    399402
    400403reverse_lazy = lazy(reverse, str)
    401404
  • 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 31a928c..4bdfad8 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 = (
Back to Top