test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove some bizzare and unnecesary code.

This commit is contained in:
Alex Gaynor 2012-11-04 13:54:54 -08:00
parent aee9c7b094
commit b98083ce3d
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/contenttypes/generic.py
View File

@ -18,6 +18,7 @@ from django.contrib.admin.options import InlineModelAdmin, flatten_fieldsets
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.utils.encoding import smart_text from django.utils.encoding import smart_text
class GenericForeignKey(object): class GenericForeignKey(object):
""" """
Provides a generic relation to any object through content-type/object-id Provides a generic relation to any object through content-type/object-id
@ -51,9 +52,6 @@ class GenericForeignKey(object):
kwargs[self.fk_field] = value._get_pk_val() kwargs[self.fk_field] = value._get_pk_val()
def get_content_type(self, obj=None, id=None, using=None): def get_content_type(self, obj=None, id=None, using=None):
# Convenience function using get_model avoids a circular import when
# using this model
ContentType = get_model("contenttypes", "contenttype")
if obj: if obj:
return ContentType.objects.db_manager(obj._state.db).get_for_model(obj) return ContentType.objects.db_manager(obj._state.db).get_for_model(obj)
elif id: elif id:
@ -215,7 +213,6 @@ class GenericRelation(RelatedField, Field):
""" """
if negate: if negate:
return [] return []
ContentType = get_model("contenttypes", "contenttype")
content_type = ContentType.objects.get_for_model(self.model) content_type = ContentType.objects.get_for_model(self.model)
prefix = "__".join(pieces[:pos + 1]) prefix = "__".join(pieces[:pos + 1])
return [("%s__%s" % (prefix, self.content_type_field_name), return [("%s__%s" % (prefix, self.content_type_field_name),