diff options
| author | Benjamin Peterson <benjamin@python.org> | 2013-10-18 16:58:17 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2013-10-18 16:58:17 (GMT) |
| commit | 559ae0fb1c4b071fb919ddc10144dd3bf80db07e (patch) | |
| tree | b1394b2c5732171c35b1ede13026d9dc540ac425 /Doc | |
| parent | 48df60c847fd5bba711cc28705c4aff1ad0b922b (diff) | |
| parent | 910a66566af5ed63cd1fbabd2d4db2569659ef14 (diff) | |
| download | cpython-559ae0fb1c4b071fb919ddc10144dd3bf80db07e.zip cpython-559ae0fb1c4b071fb919ddc10144dd3bf80db07e.tar.gz cpython-559ae0fb1c4b071fb919ddc10144dd3bf80db07e.tar.bz2 | |
merge 3.3
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/howto/descriptor.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst index cc1b78d..a0c6988 100644 --- a/Doc/howto/descriptor.rst +++ b/Doc/howto/descriptor.rst @@ -119,7 +119,7 @@ The important points to remember are: The object returned by ``super()`` also has a custom :meth:`__getattribute__` method for invoking descriptors. The call ``super(B, obj).m()`` searches ``obj.__class__.__mro__`` for the base class ``A`` immediately following ``B`` -and then returns ``A.__dict__['m'].__get__(obj, A)``. If not a descriptor, +and then returns ``A.__dict__['m'].__get__(obj, B)``. If not a descriptor, ``m`` is returned unchanged. If not in the dictionary, ``m`` reverts to a search using :meth:`object.__getattribute__`. |