summaryrefslogtreecommitdiff
path: root/Doc/reference/datamodel.rst
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2011-03-22 16:27:31 -0700
committerRaymond Hettinger <python@rcn.com>2011-03-22 16:27:31 -0700
commita7c4769506ce8e0021c818e8bc1452f024658428 (patch)
treed5891a94c54d57efd7531bdf59647d0c605f72da /Doc/reference/datamodel.rst
parent4e0e5c9a52ce2d60fa9a4fd455210bb3629e848f (diff)
parent2aa1036e1a9eab977630e1120f2ce717bf23e6ac (diff)
downloadcpython-a7c4769506ce8e0021c818e8bc1452f024658428.tar.gz
Issue #10771: Clarify that descriptors get used in an *owner* class or one of its parents.
Diffstat (limited to 'Doc/reference/datamodel.rst')
-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 09ddaf5f16..129f987a44 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1352,10 +1352,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)