summaryrefslogtreecommitdiff
path: root/Doc/whatsnew/3.6.rst
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-12-22 19:50:19 -0500
committerNed Deily <nad@python.org>2016-12-22 19:50:19 -0500
commit77d67aa5ab4f435c11309534eb1fe63f58df64fd (patch)
treeffee5ea56731a29b63df426bfd73cef508444e39 /Doc/whatsnew/3.6.rst
parent255dba4c39dc3ccc94df37c79fe4ee1e52ca5ab8 (diff)
parent9886c7591be25615bca23ca58d87ca66bf98a6f0 (diff)
downloadcpython-77d67aa5ab4f435c11309534eb1fe63f58df64fd.tar.gz
Merge 3.6.0 release engineering head
Diffstat (limited to 'Doc/whatsnew/3.6.rst')
-rw-r--r--Doc/whatsnew/3.6.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index c0d8ac4053..4cabb60b4c 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -363,7 +363,7 @@ ensure that the new ``__classcell__`` namespace entry is propagated to
PEP 487: Descriptor Protocol Enhancements
-----------------------------------------
-:pep:`487` extends the descriptor protocol has to include the new optional
+:pep:`487` extends the descriptor protocol to include the new optional
:meth:`~object.__set_name__` method. Whenever a new class is defined, the new
method will be called on all descriptors included in the definition, providing
them with a reference to the class being defined and the name given to the