[Python-checkins] cpython (merge 3.1 -> 3.2): Issue #10771: Clarify that descriptors get used in an *owner* class or one of

[raymond.hettinger]

http://hg.python.org/cpython/rev/4dfbf8c8f4e5
changeset:   68850:4dfbf8c8f4e5
branch:      3.2
parent:      68847:f882b284d260
parent:      68849:b31606ea7ce3
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Mar 22 16:27:31 2011 -0700
summary:
  Issue #10771: Clarify that descriptors get used in an *owner* class or one of its parents.

files:
  Doc/reference/datamodel.rst

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1352,10 +1352,11 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 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)

-- 
Repository URL: http://hg.python.org/cpython