From a44d0aace33f08f3fb0a0eb7bd45a32d8366940e Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Wed, 3 Dec 2008 15:45:19 +0000 Subject: [PATCH] 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 --- django/contrib/contenttypes/generic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index 0504592ebb4..c294f745000 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -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