summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo van Kemenade <hugovk@users.noreply.github.com>2021-01-12 23:16:37 (GMT)
committerGitHub <noreply@github.com>2021-01-12 23:16:37 (GMT)
commitc47c78b878ff617164b2b94ff711a6103e781753 (patch)
tree14b23399ff94868b25e91b35271a15b826a63c43
parent6dfd1734f5b230bb8fbd2a9df806c1333b6652a8 (diff)
downloadcpython-c47c78b878ff617164b2b94ff711a6103e781753.zip
cpython-c47c78b878ff617164b2b94ff711a6103e781753.tar.gz
cpython-c47c78b878ff617164b2b94ff711a6103e781753.tar.bz2
bpo-37324: Remove ABC aliases from collections (GH-23754)
Remove deprecated aliases to Abstract Base Classes from the collections module.
-rw-r--r--Doc/library/collections.rst5
-rw-r--r--Doc/whatsnew/3.10.rst4
-rw-r--r--Lib/collections/__init__.py16
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2020-12-12-20-09-12.bpo-37324.jB-9_U.rst2
4 files changed, 6 insertions, 21 deletions
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 1293f54..aa0acfa 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -33,11 +33,6 @@ Python's general purpose built-in containers, :class:`dict`, :class:`list`,
:class:`UserString` wrapper around string objects for easier string subclassing
===================== ====================================================================
-.. deprecated-removed:: 3.3 3.10
- 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.9.
-
:class:`ChainMap` objects
-------------------------
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index d2b3ed7..7a51a9d 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -550,6 +550,10 @@ Removed
now due to the _warnings module was converted to a builtin module in 2.6.
(Contributed by Hai Shi in :issue:`42599`.)
+* Remove deprecated aliases to :ref:`collections-abstract-base-classes` from
+ the :mod:`collections` module.
+ (Contributed by Victor Stinner in :issue:`37324`.)
+
Porting to Python 3.10
======================
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index 9c25a2d..7d33813 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -51,22 +51,6 @@ except ImportError:
pass
-def __getattr__(name):
- # For backwards compatibility, continue to make the collections ABCs
- # through Python 3.6 available through the collections module.
- # Note, no new collections ABCs were added in Python 3.7
- if name in _collections_abc.__all__:
- obj = getattr(_collections_abc, name)
- import warnings
- warnings.warn("Using or importing the ABCs from 'collections' instead "
- "of from 'collections.abc' is deprecated since Python 3.3, "
- "and in 3.10 it will stop working",
- DeprecationWarning, stacklevel=2)
- globals()[name] = obj
- return obj
- raise AttributeError(f'module {__name__!r} has no attribute {name!r}')
-
-
################################################################################
### OrderedDict
################################################################################
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-12-12-20-09-12.bpo-37324.jB-9_U.rst b/Misc/NEWS.d/next/Core and Builtins/2020-12-12-20-09-12.bpo-37324.jB-9_U.rst
new file mode 100644
index 0000000..5b57da4
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2020-12-12-20-09-12.bpo-37324.jB-9_U.rst
@@ -0,0 +1,2 @@
+Remove deprecated aliases to :ref:`collections-abstract-base-classes` from
+the :mod:`collections` module.