summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2011-03-22 23:27:02 (GMT)
committerRaymond Hettinger <python@rcn.com>2011-03-22 23:27:02 (GMT)
commit3b654be1a48f6d8584c169e08687c02de0a4a71c (patch)
tree37436b87de530778d28ee9bb44cc9572318c199b /Doc
parenta8e4d6eb6e386dc12fa586bd4a920546b505f17b (diff)
downloadcpython-3b654be1a48f6d8584c169e08687c02de0a4a71c.zip
cpython-3b654be1a48f6d8584c169e08687c02de0a4a71c.tar.gz
cpython-3b654be1a48f6d8584c169e08687c02de0a4a71c.tar.bz2
Issue #10771: Clarify that descriptors get used in an *owner* class or one of its parents.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/datamodel.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 25274ca..6f874b6 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1353,10 +1353,11 @@ Implementing Descriptors
^^^^^^^^^^^^^^^^^^^^^^^^
The following methods only apply when an instance of the class containing the
-method (a so-called *descriptor* class) appears in the class dictionary of
-another class, known as the *owner* class. In the examples below, "the
-attribute" refers to the attribute whose name is the key of the property in the
-owner class' :attr:`__dict__`.
+method (a so-called *descriptor* class) appears in an *owner* class (the
+descriptor must be in either the owner's class dictionary or in the class
+dictionary for one of its parents). In the examples below, "the attribute"
+refers to the attribute whose name is the key of the property in the owner
+class' :attr:`__dict__`.
.. method:: object.__get__(self, instance, owner)