mirror of
https://github.com/django/django.git
synced 2024-12-24 10:05:46 +00:00
Fixed #7017 -- Minor typo fix in a comment. Thanks FranRuiz.
Also promoted the comment to a docstring and removed some extra spaces. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
52945a9515
commit
ea87c0df5c
@ -35,15 +35,18 @@ class GenericForeignKey(object):
|
||||
setattr(cls, name, self)
|
||||
|
||||
def instance_pre_init(self, signal, sender, args, kwargs):
|
||||
# Handle initalizing an object with the generic FK instaed of
|
||||
# content-type/object-id fields.
|
||||
"""
|
||||
Handles initializing an object with the generic FK instaed of
|
||||
content-type/object-id fields.
|
||||
"""
|
||||
if self.name in kwargs:
|
||||
value = kwargs.pop(self.name)
|
||||
kwargs[self.ct_field] = self.get_content_type(obj=value)
|
||||
kwargs[self.fk_field] = value._get_pk_val()
|
||||
|
||||
def get_content_type(self, obj=None, id=None):
|
||||
# Convenience function using get_model avoids a circular import when using this model
|
||||
# Convenience function using get_model avoids a circular import when
|
||||
# using this model
|
||||
ContentType = get_model("contenttypes", "contenttype")
|
||||
if obj:
|
||||
return ContentType.objects.get_for_model(obj)
|
||||
@ -61,10 +64,10 @@ class GenericForeignKey(object):
|
||||
return getattr(instance, self.cache_attr)
|
||||
except AttributeError:
|
||||
rel_obj = None
|
||||
|
||||
|
||||
# Make sure to use ContentType.objects.get_for_id() to ensure that
|
||||
# lookups are cached (see ticket #5570). This takes more code than
|
||||
# the naive ``getattr(instance, self.ct_field)``, but has better
|
||||
# the naive ``getattr(instance, self.ct_field)``, but has better
|
||||
# performance when dealing with GFKs in loops and such.
|
||||
f = self.model._meta.get_field(self.ct_field)
|
||||
ct_id = getattr(instance, f.get_attname(), None)
|
||||
|
Loading…
Reference in New Issue
Block a user