Commit ea87c0df authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

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
parent 52945a95

django/contrib/contenttypes/generic.py

+8 −5
Original line number Diff line number Diff line
@@ -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)