Ticket #16406: t16406_new.diff

django/core/urlresolvers.py

@@ -198 +198 @@
             # If there are any named groups, use those as kwargs, ignoring
             # non-named groups. Otherwise, pass all non-named arguments as
             # positional arguments.
-            kwargs = match.groupdict()
-            if kwargs:
+            match_kwargs = match.groupdict()
+            if match_kwargs:
                 args = ()
             else:
                 args = match.groups()
             # In both cases, pass any extra_kwargs as **kwargs.
-            kwargs.update(self.default_args)
+            kwargs = self.default_args.copy()
+            kwargs.update(match_kwargs)
 
             return ResolverMatch(self.callback, args, kwargs, self.name)
 
@@ -374 +375 @@
                         continue
                     matches = True
                     for k, v in defaults.items():
+                        if k in params:
+                            continue
                         if kwargs.get(k, v) != v:
                             matches = False
                             break

docs/topics/http/urls.txt

@@ -587 +587 @@
 
     It's possible to have a URL pattern which captures named keyword arguments,
     and also passes arguments with the same names in its dictionary of extra
-    arguments. When this happens, the arguments in the dictionary will be used
-    instead of the arguments captured in the URL.
+    arguments. When this happens, the arguments captured in the url will be
+    used instead of the arguments in the dictionary.
 
 Passing extra options to ``include()``
 --------------------------------------

tests/regressiontests/i18n/patterns/tests.py

@@ -4 +4 @@
 import warnings
 
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse, clear_url_caches
+from django.core.urlresolvers import reverse, resolve, clear_url_caches
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.template import Template, Context
@@ -306 +306 @@
             {% language 'pt-br' %}{% url 'no-prefix-translated-slug' slug='apo' %}{% endlanguage %}""")
         self.assertEqual(tpl.render(Context({})).strip().split(),
                          [u'/vertaald/apo/', u'/traduzidos/apo/'])
+
+
+class URLExampleTests(URLTestCaseBase):
+    def test_demo(self):
+        # User accesses an english url.
+        with translation.override('en'):
+            match = resolve('/translated/apo/')
+        # Now we want provide links to the same page in other languages
+        links = []
+        langs = ['nl', 'pt-br']
+        for lang in langs:
+            with translation.override(lang):
+                links.append(reverse(match.url_name, args=match.args, kwargs=match.match_kwargs))
+        self.assertEqual(links, [u'/vertaald/apo/', u'/traduzidos/apo/'])
+        # Now we can offer the user links to the other pages
+        # print "View the page in: ",
+        # for lang, link in zip(langs, links):
+        #   print "<a href='%s'>%s</a> % (link, lang),

tests/regressiontests/i18n/patterns/urls/default.py

@@ -9 +9 @@
 urlpatterns = patterns('',
     url(r'^not-prefixed/$', view, name='not-prefixed'),
     url(_(r'^translated/$'), view, name='no-prefix-translated'),
-    url(_(r'^translated/(?P<slug>[\w-]+)/$'), view, name='no-prefix-translated-slug'),
+    url(_(r'^translated/(?P<slug>[\w-]+)/$'), view, {'extra': True},
+        name='no-prefix-translated-slug'),
 )
 
 urlpatterns += i18n_patterns('',
     url(r'^prefixed/$', view, name='prefixed'),
     url(_(r'^users/$'), view, name='users'),
-    url(_(r'^account/'), include('regressiontests.i18n.patterns.urls.namespace', namespace='account')),
+    url(_(r'^account/'), include('regressiontests.i18n.patterns.urls.namespace',
+        namespace='account')),
 )

tests/regressiontests/urlpatterns_reverse/tests.py

@@ -511 +511 @@
         self.assertRaises(ViewDoesNotExist, self.client.get, '/missing_outer/')
         self.assertRaises(ViewDoesNotExist, self.client.get, '/uncallable/')
 
+
+class TestRereverse(TestCase):
+    urls = 'regressiontests.urlpatterns_reverse.urls'
+
+    def test_rereverse(self):
+        match = resolve('/rereverse/12/')
+        self.assertEqual(reverse(match.url_name, args=match.args, kwargs=match.kwargs), '/rereverse/12/')
+        match = resolve('/rereverse-overridden/12/url/')
+        self.assertEqual(reverse(match.url_name, args=match.args, kwargs=match.kwargs), '/rereverse-overridden/12/url/')

tests/regressiontests/urlpatterns_reverse/urls.py

@@ -41 +41 @@
     url(r'^windows_path/(?P<drive_name>[A-Z]):\\(?P<path>.+)/$', empty_view,
             name="windows"),
     url(r'^special_chars/(.+)/$', empty_view, name="special"),
+    url(r'^rereverse/(?P<arg>\d+)/$', empty_view, {'extra': True},
+        name='rereverse'),
+    url(r'^rereverse-overridden/(?P<arg>\d+)/(?P<overridden>\w+)/$',
+        empty_view, {'extra': True, 'overridden': 'default'},
+        name='rereverse-overridden'),
     url(r'^(?P<name>.+)/\d+/$', empty_view, name="mixed"),
     url(r'^repeats/a{1,2}/$', empty_view, name="repeats"),
     url(r'^repeats/a{2,4}/$', empty_view, name="repeats2"),