summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2017-01-20 10:17:11 -0500
committerNed Deily <nad@python.org>2017-01-20 10:17:11 -0500
commit912c8fe938bc8ef56ba345dfd32bc8f7535ecc1d (patch)
treea2eee983b6b9a413cec9e932c9363594baa79855
parent72be5decb1a4622433fe2250f7192ede3255619e (diff)
parentd6955efffc7b424bce614e29b6d3fc14f819b268 (diff)
downloadcpython-912c8fe938bc8ef56ba345dfd32bc8f7535ecc1d.tar.gz
Issue #29316: merge 3.6
-rw-r--r--Doc/library/typing.rst7
-rw-r--r--Doc/whatsnew/3.6.rst9
2 files changed, 10 insertions, 6 deletions
diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst
index fd6bded005..cd59d10ca2 100644
--- a/Doc/library/typing.rst
+++ b/Doc/library/typing.rst
@@ -8,6 +8,13 @@
**Source code:** :source:`Lib/typing.py`
+.. note::
+
+ The typing module has been included in the standard library on a
+ :term:`provisional basis <provisional api>`. New features might
+ be added and API may change even between minor releases if deemed
+ necessary by the core developers.
+
--------------
This module supports type hints as specified by :pep:`484` and :pep:`526`.
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 2c5b0f499a..f6c71d374c 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -120,7 +120,7 @@ Significant improvements in the standard library:
:ref:`Local Time Disambiguation <whatsnew36-pep495>`.
* The :mod:`typing` module received a number of
- :ref:`improvements <whatsnew36-typing>` and is no longer provisional.
+ :ref:`improvements <whatsnew36-typing>`.
* The :mod:`tracemalloc` module has been significantly reworked
and is now used to provide better output for :exc:`ResourceWarning`
@@ -1544,11 +1544,8 @@ to filter block traces by their address space (domain).
typing
------
-Starting with Python 3.6 the :mod:`typing` module is no longer provisional
-and its API is considered stable.
-
-Since the :mod:`typing` module was :term:`provisional <provisional api>`
-in Python 3.5, all changes introduced in Python 3.6 have also been
+Since the :mod:`typing` module is :term:`provisional <provisional api>`,
+all changes introduced in Python 3.6 have also been
backported to Python 3.5.x.
The :mod:`typing` module has a much improved support for generic type