p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Luke Plant 2008-12-03 15:45:19 +00:00
parent 9c33d74f1d
commit a44d0aace3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ class GenericForeignKey(object):
def __get__(self, instance, instance_type=None): def __get__(self, instance, instance_type=None):
if instance is None: if instance is None:
raise AttributeError, u"%s must be accessed via instance" % self.name return self
try: try:
return getattr(instance, self.cache_attr) return getattr(instance, self.cache_attr)
@ -183,7 +183,7 @@ class ReverseGenericRelatedObjectsDescriptor(object):
def __get__(self, instance, instance_type=None): def __get__(self, instance, instance_type=None):
if instance is 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 # This import is done here to avoid circular import importing this module
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType