Commit 5ef0c03a authored by Luke Plant's avatar Luke Plant
Browse files

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
parent 4637a77f

django/db/models/fields/related.py

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