Ticket #12418: fix12418.patch

django/views/generic/list_detail.py

@@ -124 +124 @@
     try:
         obj = queryset.get()
     except ObjectDoesNotExist:
-        raise Http404("No %s found matching the query" % (model._meta.verbose_name))
+        raise Http404(u"No %s found matching the query" % (model._meta.verbose_name))
     if not template_name:
         template_name = "%s/%s_detail.html" % (model._meta.app_label, model._meta.object_name.lower())
     if template_name_field:

tests/regressiontests/views/tests/generic/object_list.py

@@ +1 @@
+from django.http import Http404
 from django.test import TestCase
+from django.views.generic import list_detail
+
+from regressiontests.views.models import Article
 
 
 class ObjectListTest(TestCase):
@@ -34 +38 @@
         url = '/views/object_list_no_paginate_by/page1/'
         response = self.check_pagination(url, 200)
         self.assertEqual(response.context['is_paginated'], False)
+
+
+class ObjectDetailTest(TestCase):
+    fixtures = ['testdata.json']
+
+    def test_object_detail_404(self):
+        a = Article.objects.all()[0]
+
+        self.assertContains(self.client.get('/views/object_detail/%d/' % a.pk),
+            'Article detail template.')
+
+        response = self.client.get('/views/object_detail/42/')
+        self.assertEqual(response.status_code, 404)
+
+    def test_object_detail_404_raises(self):
+        try:
+            list_detail.object_detail({},
+                queryset=Article.objects.all(),
+                object_id=42)
+        except Http404, e:
+            # All is well
+            pass
+        except:
+            # Re-raise if another exception happens
+            raise
+
+        # Regression test for #12418: ObjectDoesNotExist message should be unicode
+        # so that string interpolation with ugettext_lazy objects works correctly.
+        self.assertEqual(e.args[0], u'No article found matching the query')
+        self.assertEqual(type(e.args[0]), unicode)

tests/regressiontests/views/urls.py

@@ -118 +118 @@
     (r'^object_list/page(?P<page>[\w]*)/$', 'object_list', object_list_dict),
     (r'^object_list_no_paginate_by/page(?P<page>[0-9]+)/$', 'object_list',
      object_list_no_paginate_by),
+    (r'^object_detail/(?P<object_id>\d+)/$', 'object_detail',
+     object_list_no_paginate_by),
 )
 
 # a view that raises an exception for the debug view