Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #8248: made help() work on models and improved introspection su…

…pport.

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
  • Loading branch information...
commit 5ef0c03ae9aca99289737ba6d88a371ad95cf432 1 parent 4637a77
@spookylukey spookylukey authored
Showing with 5 additions and 5 deletions.
  1. +5 −5 django/db/models/fields/related.py
View
10 django/db/models/fields/related.py
@@ -175,7 +175,7 @@ def __init__(self, related):
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 @@ def __init__(self, field_with_rel):
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 @@ def __init__(self, related):
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 @@ def __init__(self, related):
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 @@ def __init__(self, m2m_field):
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.
Please sign in to comment.
Something went wrong with that request. Please try again.