https://github.com/python/cpython/commit/86efa2f1fa5ad8ddcf5966104a580cd33218547e
commit: 86efa2f1fa5ad8ddcf5966104a580cd33218547e
branch: 3.12
author: Alex Waygood <[email protected]>
committer: AlexWaygood <[email protected]>
date: 2024-11-12T12:26:23Z
summary:
[3.12] gh-126451: Revert backports of ABC registrations for contextvars.Context
and multiprocessing proxies (#126735)
files:
D Misc/NEWS.d/next/Library/2024-11-04-16-40-02.gh-issue-126417.OWPqn0.rst
D Misc/NEWS.d/next/Library/2024-11-05-11-28-45.gh-issue-126451.XJMtqz.rst
M Lib/contextvars.py
M Lib/multiprocessing/managers.py
M Lib/test/_test_multiprocessing.py
M Lib/test/test_context.py
M Misc/ACKS
diff --git a/Lib/contextvars.py b/Lib/contextvars.py
index 14514f185e069d..d78c80dfe6f99c 100644
--- a/Lib/contextvars.py
+++ b/Lib/contextvars.py
@@ -1,8 +1,4 @@
-import _collections_abc
from _contextvars import Context, ContextVar, Token, copy_context
__all__ = ('Context', 'ContextVar', 'Token', 'copy_context')
-
-
-_collections_abc.Mapping.register(Context)
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index b915e67c265b3d..75d9c18c201a86 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -18,7 +18,6 @@
import threading
import signal
import array
-import collections.abc
import queue
import time
import types
@@ -1161,8 +1160,6 @@ def __imul__(self, value):
return self
-collections.abc.MutableSequence.register(BaseListProxy)
-
DictProxy = MakeProxyType('DictProxy', (
'__contains__', '__delitem__', '__getitem__', '__iter__', '__len__',
'__setitem__', 'clear', 'copy', 'get', 'items',
@@ -1172,7 +1169,6 @@ def __imul__(self, value):
'__iter__': 'Iterator',
}
-collections.abc.MutableMapping.register(DictProxy)
ArrayProxy = MakeProxyType('ArrayProxy', (
'__len__', '__getitem__', '__setitem__'
diff --git a/Lib/test/_test_multiprocessing.py
b/Lib/test/_test_multiprocessing.py
index c190dc918dac64..3b4415b50ae2c2 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -17,7 +17,6 @@
import functools
import signal
import array
-import collections.abc
import socket
import random
import logging
@@ -2460,10 +2459,6 @@ def test_list(self):
a.append('hello')
self.assertEqual(f[0][:], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'hello'])
- def test_list_isinstance(self):
- a = self.list()
- self.assertIsInstance(a, collections.abc.MutableSequence)
-
def test_list_iter(self):
a = self.list(list(range(10)))
it = iter(a)
@@ -2504,10 +2499,6 @@ def test_dict(self):
self.assertEqual(sorted(d.values()), [chr(i) for i in indices])
self.assertEqual(sorted(d.items()), [(i, chr(i)) for i in indices])
- def test_dict_isinstance(self):
- a = self.dict()
- self.assertIsInstance(a, collections.abc.MutableMapping)
-
def test_dict_iter(self):
d = self.dict()
indices = list(range(65, 70))
diff --git a/Lib/test/test_context.py b/Lib/test/test_context.py
index d9e1c6214e7057..dc6856509a40a0 100644
--- a/Lib/test/test_context.py
+++ b/Lib/test/test_context.py
@@ -1,4 +1,3 @@
-import collections.abc
import concurrent.futures
import contextvars
import functools
@@ -343,19 +342,6 @@ def ctx2_fun():
ctx1.run(ctx1_fun)
- def test_context_isinstance(self):
- ctx = contextvars.Context()
- self.assertIsInstance(ctx, collections.abc.Mapping)
- self.assertTrue(issubclass(contextvars.Context,
collections.abc.Mapping))
-
- mapping_methods = (
- '__contains__', '__eq__', '__getitem__', '__iter__', '__len__',
- '__ne__', 'get', 'items', 'keys', 'values',
- )
- for name in mapping_methods:
- with self.subTest(name=name):
- self.assertTrue(callable(getattr(ctx, name)))
-
@isolated_context
@threading_helper.requires_working_threading()
def test_context_threads_1(self):
diff --git a/Misc/ACKS b/Misc/ACKS
index b5cf6acc55a88c..837ffbda18aea1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1259,7 +1259,6 @@ Emily Morehouse
Derek Morr
James A Morrison
Martin Morrison
-Stephen Morton
Derek McTavish Mounce
Alessandro Moura
Pablo Mouzo
diff --git
a/Misc/NEWS.d/next/Library/2024-11-04-16-40-02.gh-issue-126417.OWPqn0.rst
b/Misc/NEWS.d/next/Library/2024-11-04-16-40-02.gh-issue-126417.OWPqn0.rst
deleted file mode 100644
index c4a366343382f3..00000000000000
--- a/Misc/NEWS.d/next/Library/2024-11-04-16-40-02.gh-issue-126417.OWPqn0.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Register the :class:`!multiprocessing.managers.DictProxy` and
:class:`!multiprocessing.managers.ListProxy` types in
-:mod:`multiprocessing.managers` to :class:`collections.abc.MutableMapping` and
-:class:`collections.abc.MutableSequence`, respectively.
diff --git
a/Misc/NEWS.d/next/Library/2024-11-05-11-28-45.gh-issue-126451.XJMtqz.rst
b/Misc/NEWS.d/next/Library/2024-11-05-11-28-45.gh-issue-126451.XJMtqz.rst
deleted file mode 100644
index 563cb2515eca60..00000000000000
--- a/Misc/NEWS.d/next/Library/2024-11-05-11-28-45.gh-issue-126451.XJMtqz.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Register the :class:`contextvars.Context` type to
-:class:`collections.abc.Mapping`.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
