Commit a44d0aac authored by Luke Plant's avatar Luke Plant
Browse files

Refs #8248 - GenericRelations descriptors now return self when accessed via class 

These were missed in r9550 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 9c33d74f

django/contrib/contenttypes/generic.py

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class GenericForeignKey(object): 


    def __get__(self, instance, instance_type=None):

        if instance is None:

            raise AttributeError, u"%s must be accessed via instance" % self.name

            return self



        try:

            return getattr(instance, self.cache_attr)
@@ -183,7 +183,7 @@ class ReverseGenericRelatedObjectsDescriptor(object): 


    def __get__(self, instance, instance_type=None):

        if instance is None:

            raise AttributeError, "Manager must be accessed via instance"

            return self



        # This import is done here to avoid circular import importing this module

        from django.contrib.contenttypes.models import ContentType