bpo-36953: Delay removal of ABCs from collections. (GH-13409)
Bump the removal to 3.9, indicate collections.abc available since 3.3,
replace version-changed directive to deprecated-removed.
https://bugs.python.org/issue36953
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index ae21db2..ec921d7 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -33,10 +33,10 @@
:class:`UserString` wrapper around string objects for easier string subclassing
===================== ====================================================================
-.. versionchanged:: 3.3
+.. deprecated-removed:: 3.3 3.9
Moved :ref:`collections-abstract-base-classes` to the :mod:`collections.abc` module.
For backwards compatibility, they continue to be visible in this module through
- Python 3.7. Subsequently, they will be removed entirely.
+ Python 3.8.
:class:`ChainMap` objects
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index cb7f1bb..5b740d8 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -47,8 +47,8 @@
obj = getattr(_collections_abc, name)
import warnings
warnings.warn("Using or importing the ABCs from 'collections' instead "
- "of from 'collections.abc' is deprecated, "
- "and in 3.8 it will stop working",
+ "of from 'collections.abc' is deprecated since Python 3.3,"
+ "and in 3.9 it will stop working",
DeprecationWarning, stacklevel=2)
globals()[name] = obj
return obj
diff --git a/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-36952.I_glok.rst b/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-36952.I_glok.rst
new file mode 100644
index 0000000..eeb4fd7
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-36952.I_glok.rst
@@ -0,0 +1,5 @@
+Starting with Python 3.3, importing ABCs from :mod:`collections` is
+deprecated, and import should be done from :mod:`collections.abc`. Still
+being able to import from :mod:`collections` was marked for removal in 3.8,
+but has been delayed to 3.9; documentation and ``DeprecationWarning``
+clarified.