From 5ef0c03ae9aca99289737ba6d88a371ad95cf432 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Tue, 2 Dec 2008 22:09:51 +0000 Subject: [PATCH] Fixed #8248: made help() work on models and improved introspection support. Descriptors now return themselves when accessed via the class, as per standard Python descriptors like property(). git-svn-id: http://code.djangoproject.com/svn/django/trunk@9550 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/fields/related.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index c87b823a69..146a1ae457 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -175,7 +175,7 @@ class SingleRelatedObjectDescriptor(object): def __get__(self, instance, instance_type=None): if instance is None: - raise AttributeError, "%s must be accessed via instance" % self.related.opts.object_name + return self try: return getattr(instance, self.cache_name) @@ -223,7 +223,7 @@ class ReverseSingleRelatedObjectDescriptor(object): def __get__(self, instance, instance_type=None): if instance is None: - raise AttributeError, "%s must be accessed via instance" % self.field.name + return self cache_name = self.field.get_cache_name() try: return getattr(instance, cache_name) @@ -287,7 +287,7 @@ class ForeignRelatedObjectsDescriptor(object): def __get__(self, instance, instance_type=None): if instance is None: - raise AttributeError, "Manager must be accessed via instance" + return self rel_field = self.related.field rel_model = self.related.model @@ -500,7 +500,7 @@ class ManyRelatedObjectsDescriptor(object): def __get__(self, instance, instance_type=None): if instance is None: - raise AttributeError, "Manager must be accessed via instance" + return self # Dynamically create a class that subclasses the related # model's default manager. @@ -545,7 +545,7 @@ class ReverseManyRelatedObjectsDescriptor(object): def __get__(self, instance, instance_type=None): if instance is None: - raise AttributeError, "Manager must be accessed via instance" + return self # Dynamically create a class that subclasses the related # model's default manager.