summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorKumar Aditya <kumaraditya@python.org>2024-12-24 13:54:28 (GMT)
committerGitHub <noreply@github.com>2024-12-24 13:54:28 (GMT)
commit9fce90682553e2cfe93e98e2ae5948bf9c7c4456 (patch)
tree68349cd7bec642cadc1bb7436d1f0c54ccb91366 /Lib
parent3ddd70ceaaf67b111ee4251817e150396d6d10a9 (diff)
downloadcpython-9fce90682553e2cfe93e98e2ae5948bf9c7c4456.zip
cpython-9fce90682553e2cfe93e98e2ae5948bf9c7c4456.tar.gz
cpython-9fce90682553e2cfe93e98e2ae5948bf9c7c4456.tar.bz2
gh-127949: deprecate `asyncio.set_event_loop` (#128218)
Deprecate `asyncio.set_event_loop` to be removed in Python 3.16.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/asyncio/__main__.py2
-rw-r--r--Lib/asyncio/events.py32
-rw-r--r--Lib/asyncio/runners.py4
-rw-r--r--Lib/test/test_asyncgen.py2
-rw-r--r--Lib/test/test_asyncio/functional.py4
-rw-r--r--Lib/test/test_asyncio/test_base_events.py8
-rw-r--r--Lib/test/test_asyncio/test_events.py26
-rw-r--r--Lib/test/test_asyncio/test_futures.py8
-rw-r--r--Lib/test/test_asyncio/test_streams.py10
-rw-r--r--Lib/test/test_asyncio/test_tasks.py18
-rw-r--r--Lib/test/test_asyncio/test_unix_events.py4
-rw-r--r--Lib/test/test_asyncio/utils.py4
-rw-r--r--Lib/test/test_coroutines.py2
-rw-r--r--Lib/test/test_type_params.py2
-rw-r--r--Lib/test/test_unittest/test_async_case.py2
15 files changed, 73 insertions, 55 deletions
diff --git a/Lib/asyncio/__main__.py b/Lib/asyncio/__main__.py
index 95c636f..662ba64 100644
--- a/Lib/asyncio/__main__.py
+++ b/Lib/asyncio/__main__.py
@@ -149,7 +149,7 @@ if __name__ == '__main__':
return_code = 0
loop = asyncio.new_event_loop()
- asyncio.set_event_loop(loop)
+ asyncio._set_event_loop(loop)
repl_locals = {'asyncio': asyncio}
for key in {'__name__', '__package__',
diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 3ade774..6e291d2 100644
--- a/Lib/asyncio/events.py
+++ b/Lib/asyncio/events.py
@@ -5,16 +5,22 @@
# SPDX-FileCopyrightText: Copyright (c) 2015-2021 MagicStack Inc. http://magic.io
__all__ = (
- '_AbstractEventLoopPolicy',
- 'AbstractEventLoop', 'AbstractServer',
- 'Handle', 'TimerHandle',
- '_get_event_loop_policy',
- 'get_event_loop_policy',
- '_set_event_loop_policy',
- 'set_event_loop_policy',
- 'get_event_loop', 'set_event_loop', 'new_event_loop',
- '_set_running_loop', 'get_running_loop',
- '_get_running_loop',
+ "_AbstractEventLoopPolicy",
+ "AbstractEventLoop",
+ "AbstractServer",
+ "Handle",
+ "TimerHandle",
+ "_get_event_loop_policy",
+ "get_event_loop_policy",
+ "_set_event_loop_policy",
+ "set_event_loop_policy",
+ "get_event_loop",
+ "_set_event_loop",
+ "set_event_loop",
+ "new_event_loop",
+ "_set_running_loop",
+ "get_running_loop",
+ "_get_running_loop",
)
import contextvars
@@ -801,9 +807,13 @@ def get_event_loop():
return _get_event_loop_policy().get_event_loop()
+def _set_event_loop(loop):
+ _get_event_loop_policy().set_event_loop(loop)
+
def set_event_loop(loop):
"""Equivalent to calling get_event_loop_policy().set_event_loop(loop)."""
- _get_event_loop_policy().set_event_loop(loop)
+ warnings._deprecated('asyncio.set_event_loop', remove=(3,16))
+ _set_event_loop(loop)
def new_event_loop():
diff --git a/Lib/asyncio/runners.py b/Lib/asyncio/runners.py
index 0e63c34..b9adf29 100644
--- a/Lib/asyncio/runners.py
+++ b/Lib/asyncio/runners.py
@@ -74,7 +74,7 @@ class Runner:
loop.shutdown_default_executor(constants.THREAD_JOIN_TIMEOUT))
finally:
if self._set_event_loop:
- events.set_event_loop(None)
+ events._set_event_loop(None)
loop.close()
self._loop = None
self._state = _State.CLOSED
@@ -147,7 +147,7 @@ class Runner:
if not self._set_event_loop:
# Call set_event_loop only once to avoid calling
# attach_loop multiple times on child watchers
- events.set_event_loop(self._loop)
+ events._set_event_loop(self._loop)
self._set_event_loop = True
else:
self._loop = self._loop_factory()
diff --git a/Lib/test/test_asyncgen.py b/Lib/test/test_asyncgen.py
index 4bce6d5..5bfd789 100644
--- a/Lib/test/test_asyncgen.py
+++ b/Lib/test/test_asyncgen.py
@@ -624,7 +624,7 @@ class AsyncGenAsyncioTest(unittest.TestCase):
def setUp(self):
self.loop = asyncio.new_event_loop()
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
def tearDown(self):
self.loop.close()
diff --git a/Lib/test/test_asyncio/functional.py b/Lib/test/test_asyncio/functional.py
index d19c7a6..2934325 100644
--- a/Lib/test/test_asyncio/functional.py
+++ b/Lib/test/test_asyncio/functional.py
@@ -24,7 +24,7 @@ class FunctionalTestCaseMixin:
def setUp(self):
self.loop = self.new_loop()
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
self.loop.set_exception_handler(self.loop_exception_handler)
self.__unhandled_exceptions = []
@@ -39,7 +39,7 @@ class FunctionalTestCaseMixin:
self.fail('unexpected calls to loop.call_exception_handler()')
finally:
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
self.loop = None
def tcp_server(self, server_prog, *,
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index 08e38b0..1e063c1 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -331,10 +331,10 @@ class BaseEventLoopTests(test_utils.TestCase):
if create_loop:
loop2 = base_events.BaseEventLoop()
try:
- asyncio.set_event_loop(loop2)
+ asyncio._set_event_loop(loop2)
self.check_thread(loop, debug)
finally:
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
loop2.close()
else:
self.check_thread(loop, debug)
@@ -690,7 +690,7 @@ class BaseEventLoopTests(test_utils.TestCase):
loop = Loop()
self.addCleanup(loop.close)
- asyncio.set_event_loop(loop)
+ asyncio._set_event_loop(loop)
def run_loop():
def zero_error():
@@ -1983,7 +1983,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase):
async def stop_loop_coro(loop):
loop.stop()
- asyncio.set_event_loop(self.loop)
+ asyncio._set_event_loop(self.loop)
self.loop.set_debug(True)
self.loop.slow_callback_duration = 0.0
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index c626670..c8439c9 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -58,7 +58,7 @@ def _test_get_event_loop_new_process__sub_proc():
return 'hello'
loop = asyncio.new_event_loop()
- asyncio.set_event_loop(loop)
+ asyncio._set_event_loop(loop)
return loop.run_until_complete(doit())
@@ -2695,6 +2695,14 @@ class AbstractEventLoopTests(unittest.TestCase):
class PolicyTests(unittest.TestCase):
+ def test_asyncio_set_event_loop_deprecation(self):
+ with self.assertWarnsRegex(
+ DeprecationWarning, "'asyncio.set_event_loop' is deprecated"):
+ loop = asyncio.new_event_loop()
+ asyncio.set_event_loop(loop)
+ self.assertIs(loop, asyncio.get_event_loop())
+ loop.close()
+
def test_abstract_event_loop_policy_deprecation(self):
with self.assertWarnsRegex(
DeprecationWarning, "'asyncio.AbstractEventLoopPolicy' is deprecated"):
@@ -2824,14 +2832,14 @@ class GetEventLoopTestsMixin:
super().setUp()
self.loop = asyncio.new_event_loop()
- asyncio.set_event_loop(self.loop)
+ asyncio._set_event_loop(self.loop)
def tearDown(self):
try:
super().tearDown()
finally:
self.loop.close()
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
events._get_running_loop = self._get_running_loop_saved
events._set_running_loop = self._set_running_loop_saved
@@ -2885,7 +2893,7 @@ class GetEventLoopTestsMixin:
with self.assertRaises(TestError):
asyncio.get_event_loop()
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
with self.assertRaises(TestError):
asyncio.get_event_loop()
@@ -2900,10 +2908,10 @@ class GetEventLoopTestsMixin:
loop.run_until_complete(func())
- asyncio.set_event_loop(loop)
+ asyncio._set_event_loop(loop)
with self.assertRaises(TestError):
asyncio.get_event_loop()
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
with self.assertRaises(TestError):
asyncio.get_event_loop()
@@ -2927,7 +2935,7 @@ class GetEventLoopTestsMixin:
with self.assertRaisesRegex(RuntimeError, 'no current'):
asyncio.get_event_loop()
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
with self.assertRaisesRegex(RuntimeError, 'no current'):
asyncio.get_event_loop()
@@ -2938,10 +2946,10 @@ class GetEventLoopTestsMixin:
loop.run_until_complete(func())
- asyncio.set_event_loop(loop)
+ asyncio._set_event_loop(loop)
self.assertIs(asyncio.get_event_loop(), loop)
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
with self.assertRaisesRegex(RuntimeError, 'no current'):
asyncio.get_event_loop()
diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index 7db70a4..84b4401 100644
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -178,8 +178,8 @@ class BaseFutureTests:
def test_constructor_use_global_loop(self):
# Deprecated in 3.10, undeprecated in 3.12
- asyncio.set_event_loop(self.loop)
- self.addCleanup(asyncio.set_event_loop, None)
+ asyncio._set_event_loop(self.loop)
+ self.addCleanup(asyncio._set_event_loop, None)
f = self._new_future()
self.assertIs(f._loop, self.loop)
self.assertIs(f.get_loop(), self.loop)
@@ -566,8 +566,8 @@ class BaseFutureTests:
def test_wrap_future_use_global_loop(self):
# Deprecated in 3.10, undeprecated in 3.12
- asyncio.set_event_loop(self.loop)
- self.addCleanup(asyncio.set_event_loop, None)
+ asyncio._set_event_loop(self.loop)
+ self.addCleanup(asyncio._set_event_loop, None)
def run(arg):
return (arg, threading.get_ident())
ex = concurrent.futures.ThreadPoolExecutor(1)
diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index c3ba90b..047ada8 100644
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -71,7 +71,7 @@ class StreamTests(test_utils.TestCase):
try:
reader, writer = self.loop.run_until_complete(open_connection_fut)
finally:
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
writer.write(b'GET / HTTP/1.0\r\n\r\n')
f = reader.read()
data = self.loop.run_until_complete(f)
@@ -839,8 +839,8 @@ class StreamTests(test_utils.TestCase):
# asyncio issue #184: Ensure that StreamReaderProtocol constructor
# retrieves the current loop if the loop parameter is not set
# Deprecated in 3.10, undeprecated in 3.12
- self.addCleanup(asyncio.set_event_loop, None)
- asyncio.set_event_loop(self.loop)
+ self.addCleanup(asyncio._set_event_loop, None)
+ asyncio._set_event_loop(self.loop)
reader = asyncio.StreamReader()
self.assertIs(reader._loop, self.loop)
@@ -863,8 +863,8 @@ class StreamTests(test_utils.TestCase):
# asyncio issue #184: Ensure that StreamReaderProtocol constructor
# retrieves the current loop if the loop parameter is not set
# Deprecated in 3.10, undeprecated in 3.12
- self.addCleanup(asyncio.set_event_loop, None)
- asyncio.set_event_loop(self.loop)
+ self.addCleanup(asyncio._set_event_loop, None)
+ asyncio._set_event_loop(self.loop)
reader = mock.Mock()
protocol = asyncio.StreamReaderProtocol(reader)
self.assertIs(protocol._loop, self.loop)
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 7d6d056..b536322 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -212,8 +212,8 @@ class BaseTaskTests:
self.assertEqual(t.result(), 'ok')
# Deprecated in 3.10, undeprecated in 3.12
- asyncio.set_event_loop(self.loop)
- self.addCleanup(asyncio.set_event_loop, None)
+ asyncio._set_event_loop(self.loop)
+ self.addCleanup(asyncio._set_event_loop, None)
t = asyncio.ensure_future(notmuch())
self.assertIs(t._loop, self.loop)
self.loop.run_until_complete(t)
@@ -2202,8 +2202,8 @@ class BaseTaskTests:
async def coro():
return 42
- asyncio.set_event_loop(self.loop)
- self.addCleanup(asyncio.set_event_loop, None)
+ asyncio._set_event_loop(self.loop)
+ self.addCleanup(asyncio._set_event_loop, None)
outer = asyncio.shield(coro())
self.assertEqual(outer._loop, self.loop)
res = self.loop.run_until_complete(outer)
@@ -2273,7 +2273,7 @@ class BaseTaskTests:
self.assertEqual(self.all_tasks(loop=self.loop), {task})
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
# execute the task so it waits for future
self.loop._run_once()
@@ -3278,8 +3278,8 @@ class FutureGatherTests(GatherTestsBase, test_utils.TestCase):
def test_constructor_empty_sequence_use_global_loop(self):
# Deprecated in 3.10, undeprecated in 3.12
- asyncio.set_event_loop(self.one_loop)
- self.addCleanup(asyncio.set_event_loop, None)
+ asyncio._set_event_loop(self.one_loop)
+ self.addCleanup(asyncio._set_event_loop, None)
fut = asyncio.gather()
self.assertIsInstance(fut, asyncio.Future)
self.assertIs(fut._loop, self.one_loop)
@@ -3386,8 +3386,8 @@ class CoroutineGatherTests(GatherTestsBase, test_utils.TestCase):
# Deprecated in 3.10, undeprecated in 3.12
async def coro():
return 'abc'
- asyncio.set_event_loop(self.other_loop)
- self.addCleanup(asyncio.set_event_loop, None)
+ asyncio._set_event_loop(self.other_loop)
+ self.addCleanup(asyncio._set_event_loop, None)
gen1 = coro()
gen2 = coro()
fut = asyncio.gather(gen1, gen2)
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index e9ee970..ebb4cc0 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -1116,11 +1116,11 @@ class TestFunctional(unittest.TestCase):
def setUp(self):
self.loop = asyncio.new_event_loop()
- asyncio.set_event_loop(self.loop)
+ asyncio._set_event_loop(self.loop)
def tearDown(self):
self.loop.close()
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
def test_add_reader_invalid_argument(self):
def assert_raises():
diff --git a/Lib/test/test_asyncio/utils.py b/Lib/test/test_asyncio/utils.py
index b8dbe7f..35ce138 100644
--- a/Lib/test/test_asyncio/utils.py
+++ b/Lib/test/test_asyncio/utils.py
@@ -541,7 +541,7 @@ class TestCase(unittest.TestCase):
if loop is None:
raise AssertionError('loop is None')
# ensure that the event loop is passed explicitly in asyncio
- events.set_event_loop(None)
+ events._set_event_loop(None)
if cleanup:
self.addCleanup(self.close_loop, loop)
@@ -554,7 +554,7 @@ class TestCase(unittest.TestCase):
self._thread_cleanup = threading_helper.threading_setup()
def tearDown(self):
- events.set_event_loop(None)
+ events._set_event_loop(None)
# Detect CPython bug #23353: ensure that yield/yield-from is not used
# in an except block of a generator
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index a72c43f..840043d 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -2287,7 +2287,7 @@ class CoroAsyncIOCompatTest(unittest.TestCase):
buffer.append('unreachable')
loop = asyncio.new_event_loop()
- asyncio.set_event_loop(loop)
+ asyncio._set_event_loop(loop)
try:
loop.run_until_complete(f())
except MyException:
diff --git a/Lib/test/test_type_params.py b/Lib/test/test_type_params.py
index 433b195..89f836c 100644
--- a/Lib/test/test_type_params.py
+++ b/Lib/test/test_type_params.py
@@ -1060,7 +1060,7 @@ class TypeParamsTypeVarTest(unittest.TestCase):
co = get_coroutine()
- self.addCleanup(asyncio.set_event_loop_policy, None)
+ self.addCleanup(asyncio._set_event_loop_policy, None)
a, b = asyncio.run(co())
self.assertIsInstance(a, TypeVar)
diff --git a/Lib/test/test_unittest/test_async_case.py b/Lib/test/test_unittest/test_async_case.py
index 993e6bf..fc996b4 100644
--- a/Lib/test/test_unittest/test_async_case.py
+++ b/Lib/test/test_unittest/test_async_case.py
@@ -476,7 +476,7 @@ class TestAsyncCase(unittest.TestCase):
def test_setup_get_event_loop(self):
# See https://github.com/python/cpython/issues/95736
# Make sure the default event loop is not used
- asyncio.set_event_loop(None)
+ asyncio._set_event_loop(None)
class TestCase1(unittest.IsolatedAsyncioTestCase):
def setUp(self):