Ticket #17566: 17566-2.diff

django/core/urlresolvers.py

@@ -246 +246 @@
 
     def __repr__(self):
         return smart_str('<%s %s (%s:%s) %s>' % (
-            self.__class__.__name__, self.urlconf_name, self.app_name,
+            self.__class__.__name__, force_text(self.urlconf_name), self.app_name,
             self.namespace, self.regex.pattern))
 
     def _populate(self):

tests/regressiontests/admin_views/admin.py

@@ -27 +27 @@
     Album, Question, Answer, ComplexSortedPerson, PrePopulatedPostLargeSlug,
     AdminOrderedField, AdminOrderedModelMethod, AdminOrderedAdminMethod,
     AdminOrderedCallable, Report, Color2, UnorderedObject, MainPrepopulated,
-    RelatedPrepopulated, UndeletableObject)
+    RelatedPrepopulated, UndeletableObject, UnicodeModel)
 
 
 def callable_year(dt_value):
@@ -622 +622 @@
 site.register(MainPrepopulated, MainPrepopulatedAdmin)
 site.register(UnorderedObject, UnorderedObjectAdmin)
 site.register(UndeletableObject, UndeletableObjectAdmin)
+site.register(UnicodeModel)
 
 # We intentionally register Promo and ChapterXtra1 but not Chapter nor ChapterXtra2.
 # That way we cover all four cases:

tests/regressiontests/admin_views/models.py

@@ -649 +649 @@
     Refs #10057.
     """
     name = models.CharField(max_length=255)
+
+
+@python_2_unicode_compatible
+class UnicodeModel(models.Model):
+    name = models.CharField(max_length=50, verbose_name='¿Name?')
+    class Meta:
+        verbose_name = '¿Chapter?'
+        app_label = 'Продавница'
+
+    def __str__(self):
+        return self.name

tests/regressiontests/admin_views/tests.py

@@ -1637 +1637 @@
         response = self.client.post('/test_admin/admin/admin_views/book/1/delete/', delete_dict)
         self.assertRedirects(response, '/test_admin/admin/admin_views/book/')
 
+    @override_settings(DEBUG=True)
+    def test_unicode_app_label(self):
+        """
+        Test the technical_404_response debug view can be generated with
+        unicode content (#17566)
+        """
+        response = self.client.get('/test_admin/admin/book/notexist/')
+        self.assertEqual(response.status_code, 404)
+
 
 @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
 class AdminViewListEditable(TestCase):