summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGéry Ogam <gery.ogam@gmail.com>2019-10-29 07:04:01 (GMT)
committerRaymond Hettinger <rhettinger@users.noreply.github.com>2019-10-29 07:04:01 (GMT)
commit4c155f738dc2e70ccb574f5169ad89c01753c6f7 (patch)
treec3d1a35d4fd0e6cda518e280190d216aabc49d75 /Doc
parent0078a0c2a59a358fa032ec9847c108378b66b656 (diff)
downloadcpython-4c155f738dc2e70ccb574f5169ad89c01753c6f7.zip
cpython-4c155f738dc2e70ccb574f5169ad89c01753c6f7.tar.gz
cpython-4c155f738dc2e70ccb574f5169ad89c01753c6f7.tar.bz2
bpo-38336: Remove the __set__ method restriction on data descriptors for attribute lookup precedence (GH-16520)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/datamodel.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index c6c6e40..2499aeb 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -1716,7 +1716,7 @@ the descriptor defines :meth:`__set__` and/or :meth:`__delete__`, it is a data
descriptor; if it defines neither, it is a non-data descriptor. Normally, data
descriptors define both :meth:`__get__` and :meth:`__set__`, while non-data
descriptors have just the :meth:`__get__` method. Data descriptors with
-:meth:`__set__` and :meth:`__get__` defined always override a redefinition in an
+:meth:`__get__` and :meth:`__set__` (and/or :meth:`__delete__`) defined always override a redefinition in an
instance dictionary. In contrast, non-data descriptors can be overridden by
instances.