Ticket #10015: 10015_r9729.diff

django/contrib/contenttypes/generic.py

@@ -310 +310 @@
             return self.model._default_manager.empty()
         return self.model._default_manager.filter(**{
             self.ct_field.name: ContentType.objects.get_for_model(self.instance),
-            self.ct_fk_field.name: self.instance.pk,
+            self.ct_fk_field.name: self._cast_instance_pk(self.instance.pk),
         })
 
+    def _cast_instance_pk(self, pk):
+        if self.ct_fk_field.get_internal_type() == 'TextField':
+            return smart_unicode(pk)
+        return pk
+
     def save_new(self, form, commit=True):
         # Avoid a circular import.
         from django.contrib.contenttypes.models import ContentType