From 6daa5fc2bc3aa86ce0aa921b99a21bcf51051a34 Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Sat, 18 May 2019 12:59:57 -0700 Subject: [PATCH 1/4] bpo-36953: Delay removal of ABCs from collections. Bump the removal to 3.9, indicate collections.abc available since 3.3, replace version-changed directive tdeprecated-removed. --- Doc/library/collections.rst | 4 ++-- Lib/collections/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index e0469c20810006..8213a46598ab80 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -33,10 +33,10 @@ Python's general purpose built-in containers, :class:`dict`, :class:`list`, :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.7. :class:`ChainMap` objects diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py index 960d82a5dcfbf5..a0d586fd663d3e 100644 --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -47,8 +47,8 @@ def __getattr__(name): 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 From dc5a9670ac3662ec50f2ea210ded3c25c101c423 Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Sat, 18 May 2019 13:16:33 -0700 Subject: [PATCH 2/4] Update Doc/library/collections.rst Co-Authored-By: Xtreak --- Doc/library/collections.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 8213a46598ab80..b87aefc461a120 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -36,7 +36,7 @@ Python's general purpose built-in containers, :class:`dict`, :class:`list`, .. 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. + Python 3.8. :class:`ChainMap` objects From c34186d0a7073a024f5810e10dc8a9581b5de83a Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Mon, 20 May 2019 08:54:52 -0700 Subject: [PATCH 3/4] add blurb --- .../next/Library/2019-05-20-08-54-41.bpo-25988.I_glok.rst | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-25988.I_glok.rst diff --git a/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-25988.I_glok.rst b/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-25988.I_glok.rst new file mode 100644 index 00000000000000..eeb4fd71e67bf5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-25988.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. From d652184d7866e1cab0d24ee8271fdb83dfe0f862 Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Mon, 20 May 2019 09:36:02 -0700 Subject: [PATCH 4/4] move and rename blurb --- ...-25988.I_glok.rst => 2019-05-20-08-54-41.bpo-36952.I_glok.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Misc/NEWS.d/next/Library/{2019-05-20-08-54-41.bpo-25988.I_glok.rst => 2019-05-20-08-54-41.bpo-36952.I_glok.rst} (100%) diff --git a/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-25988.I_glok.rst b/Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-36952.I_glok.rst similarity index 100% rename from Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-25988.I_glok.rst rename to Misc/NEWS.d/next/Library/2019-05-20-08-54-41.bpo-36952.I_glok.rst