changeset:   106248:ef416878495f
parent:      106246:f44f44b14dfc
parent:      106247:72c64b6e5486
user:        Ned Deily <nad@python.org>
date:        Fri Jan 20 10:17:11 2017 -0500
files:       Doc/whatsnew/3.6.rst Misc/NEWS
description:
Issue #29316: merge 3.6


diff -r f44f44b14dfc -r ef416878495f Doc/library/typing.rst
--- a/Doc/library/typing.rst	Fri Jan 20 08:35:18 2017 +0200
+++ b/Doc/library/typing.rst	Fri Jan 20 10:17:11 2017 -0500
@@ -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 -r f44f44b14dfc -r ef416878495f Doc/whatsnew/3.6.rst
--- a/Doc/whatsnew/3.6.rst	Fri Jan 20 08:35:18 2017 +0200
+++ b/Doc/whatsnew/3.6.rst	Fri Jan 20 10:17:11 2017 -0500
@@ -120,7 +120,7 @@
   :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 @@
 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