Commit 5d568bcf authored by Athena's avatar Athena Committed by Baptiste Mispelon
Browse files

Fixed #7571 -- Fixed parameter matching in include()'d urlpattern 

Fixed URL resolving in the case where an outer regex includes an inner
regex and both regexes use positional parameters instead of named
groups, causing the outer regex's parameters to override the inner
regex's.

Modified the regex url resolver so that it will concatenates and then
normalizes, instead of normalizing and then concatenating.
parent a248c883

django/core/urlresolvers.py

+2 −4
Original line number Diff line number Diff line
@@ -271,12 +271,10 @@ class RegexURLResolver(LocaleRegexProvider): 
                    if pattern.app_name:

                        apps.setdefault(pattern.app_name, []).append(pattern.namespace)

                else:

                    parent = normalize(pattern.regex.pattern)

                    parent_pat = 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)

                            new_matches = normalize(parent_pat + pat)

                            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)

tests/urlpatterns_reverse/included_no_kwargs_urls.py

0 → 100644
+8 −0
Original line number Diff line number Diff line 
from django.conf.urls import patterns, url



from .views import empty_view





urlpatterns = patterns('',

    url(r'^inner-no-kwargs/(\d+)/', empty_view, name="inner-no-kwargs")

)

tests/urlpatterns_reverse/tests.py

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ test_data = ( 
    ('inner-extra', '/outer/42/extra/inner/', [], {'extra': 'inner', 'outer': '42'}),

    ('inner-extra', '/outer/42/extra/inner/', ['42', 'inner'], {}),

    ('inner-extra', NoReverseMatch, ['fred', 'inner'], {}),

    ('inner-no-kwargs', '/outer-no-kwargs/42/inner-no-kwargs/1/', ['42', '1'], {}),

    ('disjunction', NoReverseMatch, ['foo'], {}),

    ('inner-disjunction', NoReverseMatch, ['10', '11'], {}),

    ('extra-places', '/e-places/10/', ['10'], {}),

tests/urlpatterns_reverse/urls.py

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ urlpatterns = patterns('', 
    url(r'^test/1/?', empty_view, name="test"),

    url(r'^(?i)test/2/?$', empty_view, name="test2"),

    url(r'^outer/(?P<outer>\d+)/', include('urlpatterns_reverse.included_urls')),

    url(r'^outer-no-kwargs/(\d+)/', include('urlpatterns_reverse.included_no_kwargs_urls')),

    url('', include('urlpatterns_reverse.extra_urls')),



    # This is non-reversible, but we shouldn't blow up when parsing it.