Ticket #13051: ns.diff

django/core/urlresolvers.py

@@ -338 +338 @@
                 elif ns not in app_list:
                     # The name isn't shared by one of the instances (i.e., the default)
                     # so just pick the first instance as the default.
-                    ns = app_list[0]
+                    # We actually use the last as the list is reversed!
+                    ns = app_list[-1]
             except KeyError:
                 pass
 

tests/regressiontests/urlpatterns_reverse/tests.py

@@ -242 +242 @@
 
     def test_app_lookup_object_without_default(self):
         "An application namespace without a default is sensitive to the 'current' app can be used for lookup"
-        self.assertEquals('/other2/inner/', reverse('nodefault:urlobject-view'))
-        self.assertEquals('/other2/inner/37/42/', reverse('nodefault:urlobject-view', args=[37,42]))
-        self.assertEquals('/other2/inner/42/37/', reverse('nodefault:urlobject-view', kwargs={'arg1':42, 'arg2':37}))
+        self.assertEquals('/other1/inner/', reverse('nodefault:urlobject-view'))
+        self.assertEquals('/other1/inner/37/42/', reverse('nodefault:urlobject-view', args=[37,42]))
+        self.assertEquals('/other1/inner/42/37/', reverse('nodefault:urlobject-view', kwargs={'arg1':42, 'arg2':37}))
 
-        self.assertEquals('/other1/inner/', reverse('nodefault:urlobject-view', current_app='other-ns1'))
-        self.assertEquals('/other1/inner/37/42/', reverse('nodefault:urlobject-view', args=[37,42], current_app='other-ns1'))
-        self.assertEquals('/other1/inner/42/37/', reverse('nodefault:urlobject-view', kwargs={'arg1':42, 'arg2':37}, current_app='other-ns1'))
+        self.assertEquals('/other2/inner/', reverse('nodefault:urlobject-view', current_app='other-ns2'))
+        self.assertEquals('/other2/inner/37/42/', reverse('nodefault:urlobject-view', args=[37,42], current_app='other-ns2'))
+        self.assertEquals('/other2/inner/42/37/', reverse('nodefault:urlobject-view', kwargs={'arg1':42, 'arg2':37}, current_app='other-ns2'))
 
 class RequestURLconfTests(TestCase):
     def setUp(self):