Ticket #14543: 14543.2.patch

django/contrib/contenttypes/tests.py

@@ +1 @@
+import urllib
 from django import db
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
@@ -6 +7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpRequest
 from django.test import TestCase
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import smart_str
 
+class User(models.Model):
+    """fake User table for test_shortcut_view"""
+    username = models.CharField(_('username'), max_length=30, unique=True, help_text=_("Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"))
+    class Meta:
+        verbose_name = _('user')
+        verbose_name_plural = _('users')
+
+    def __unicode__(self):
+        return self.username
+
+    def get_absolute_url(self):
+        return "/users/%s/" % urllib.quote(smart_str(self.username))
 
 class ContentTypesTests(TestCase):
 
@@ -58 +74 @@
             "SERVER_NAME": "Example.com",
             "SERVER_PORT": "80",
         }
-        from django.contrib.auth.models import User
         user_ct = ContentType.objects.get_for_model(User)
         obj = User.objects.create(username="john")