Remove any deprecation warnings in asyncio.get_event_loop()
The warnings were added in 3.11.1 and will be reverted in 3.11.2. They make some Fedora packages fail to build, so we backport the revert.
This commit is contained in:
parent
74be3865a3
commit
d3687aa7a3
@ -0,0 +1,171 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Serhiy Storchaka <storchaka@gmail.com>
|
||||||
|
Date: Tue, 10 Jan 2023 22:20:09 +0200
|
||||||
|
Subject: [PATCH] 00396: gh-100160: Remove any deprecation warnings in
|
||||||
|
asyncio.get_event_loop()
|
||||||
|
|
||||||
|
Some deprecation warnings will reappear (in a slightly different form) in 3.12.
|
||||||
|
|
||||||
|
Co-authored-by: Guido van Rossum <guido@python.org>
|
||||||
|
---
|
||||||
|
Doc/library/asyncio-eventloop.rst | 14 +++++++-------
|
||||||
|
Doc/library/asyncio-policy.rst | 9 +++++----
|
||||||
|
Doc/whatsnew/3.10.rst | 13 -------------
|
||||||
|
Lib/asyncio/events.py | 15 ---------------
|
||||||
|
Lib/test/test_asyncio/test_events.py | 12 +++---------
|
||||||
|
...2022-12-21-18-29-24.gh-issue-100160.isBmL5.rst | 2 ++
|
||||||
|
6 files changed, 17 insertions(+), 48 deletions(-)
|
||||||
|
create mode 100644 Misc/NEWS.d/next/Library/2022-12-21-18-29-24.gh-issue-100160.isBmL5.rst
|
||||||
|
|
||||||
|
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
|
||||||
|
index 28b7a90058..886399e7ae 100644
|
||||||
|
--- a/Doc/library/asyncio-eventloop.rst
|
||||||
|
+++ b/Doc/library/asyncio-eventloop.rst
|
||||||
|
@@ -48,7 +48,7 @@ an event loop:
|
||||||
|
running event loop.
|
||||||
|
|
||||||
|
If there is no running event loop set, the function will return
|
||||||
|
- the result of ``get_event_loop_policy().get_event_loop()`` call.
|
||||||
|
+ the result of the ``get_event_loop_policy().get_event_loop()`` call.
|
||||||
|
|
||||||
|
Because this function has rather complex behavior (especially
|
||||||
|
when custom event loop policies are in use), using the
|
||||||
|
@@ -59,15 +59,15 @@ an event loop:
|
||||||
|
instead of using these lower level functions to manually create and close an
|
||||||
|
event loop.
|
||||||
|
|
||||||
|
- .. deprecated:: 3.10
|
||||||
|
- Deprecation warning is emitted if there is no current event loop.
|
||||||
|
- In Python 3.12 it will be an error.
|
||||||
|
-
|
||||||
|
.. note::
|
||||||
|
In Python versions 3.10.0--3.10.8 and 3.11.0 this function
|
||||||
|
- (and other functions which used it implicitly) emitted a
|
||||||
|
+ (and other functions which use it implicitly) emitted a
|
||||||
|
:exc:`DeprecationWarning` if there was no running event loop, even if
|
||||||
|
- the current loop was set.
|
||||||
|
+ the current loop was set on the policy.
|
||||||
|
+ In Python versions 3.10.9, 3.11.1 and 3.12 they emit a
|
||||||
|
+ :exc:`DeprecationWarning` if there is no running event loop and no
|
||||||
|
+ current loop is set.
|
||||||
|
+ In some future Python release this will become an error.
|
||||||
|
|
||||||
|
.. function:: set_event_loop(loop)
|
||||||
|
|
||||||
|
diff --git a/Doc/library/asyncio-policy.rst b/Doc/library/asyncio-policy.rst
|
||||||
|
index d0af45febd..eb043b3e5e 100644
|
||||||
|
--- a/Doc/library/asyncio-policy.rst
|
||||||
|
+++ b/Doc/library/asyncio-policy.rst
|
||||||
|
@@ -112,10 +112,11 @@ asyncio ships with the following built-in policies:
|
||||||
|
|
||||||
|
On Windows, :class:`ProactorEventLoop` is now used by default.
|
||||||
|
|
||||||
|
- .. deprecated:: 3.11.1
|
||||||
|
- :meth:`get_event_loop` now emits a :exc:`DeprecationWarning` if there
|
||||||
|
- is no current event loop set and a new event loop has been implicitly
|
||||||
|
- created. In Python 3.12 it will be an error.
|
||||||
|
+ .. note::
|
||||||
|
+ In Python versions 3.10.9, 3.11.1 and 3.12 this function emits a
|
||||||
|
+ :exc:`DeprecationWarning` if there is no running event loop and no
|
||||||
|
+ current loop is set.
|
||||||
|
+ In some future Python release this will become an error.
|
||||||
|
|
||||||
|
|
||||||
|
.. class:: WindowsSelectorEventLoopPolicy
|
||||||
|
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
|
||||||
|
index d0b436664a..38b30deff7 100644
|
||||||
|
--- a/Doc/whatsnew/3.10.rst
|
||||||
|
+++ b/Doc/whatsnew/3.10.rst
|
||||||
|
@@ -1710,19 +1710,6 @@ Deprecated
|
||||||
|
scheduled for removal in Python 3.12.
|
||||||
|
(Contributed by Erlend E. Aasland in :issue:`42264`.)
|
||||||
|
|
||||||
|
-* :func:`asyncio.get_event_loop` now emits a deprecation warning if there is
|
||||||
|
- no running event loop. In the future it will be an alias of
|
||||||
|
- :func:`~asyncio.get_running_loop`.
|
||||||
|
- :mod:`asyncio` functions which implicitly create :class:`~asyncio.Future`
|
||||||
|
- or :class:`~asyncio.Task` objects now emit
|
||||||
|
- a deprecation warning if there is no running event loop and no explicit
|
||||||
|
- *loop* argument is passed: :func:`~asyncio.ensure_future`,
|
||||||
|
- :func:`~asyncio.wrap_future`, :func:`~asyncio.gather`,
|
||||||
|
- :func:`~asyncio.shield`, :func:`~asyncio.as_completed` and constructors of
|
||||||
|
- :class:`~asyncio.Future`, :class:`~asyncio.Task`,
|
||||||
|
- :class:`~asyncio.StreamReader`, :class:`~asyncio.StreamReaderProtocol`.
|
||||||
|
- (Contributed by Serhiy Storchaka in :issue:`39529`.)
|
||||||
|
-
|
||||||
|
* The undocumented built-in function ``sqlite3.enable_shared_cache`` is now
|
||||||
|
deprecated, scheduled for removal in Python 3.12. Its use is strongly
|
||||||
|
discouraged by the SQLite3 documentation. See `the SQLite3 docs
|
||||||
|
diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
|
||||||
|
index af3f9e970b..b1799320ea 100644
|
||||||
|
--- a/Lib/asyncio/events.py
|
||||||
|
+++ b/Lib/asyncio/events.py
|
||||||
|
@@ -671,21 +671,6 @@ def get_event_loop(self):
|
||||||
|
if (self._local._loop is None and
|
||||||
|
not self._local._set_called and
|
||||||
|
threading.current_thread() is threading.main_thread()):
|
||||||
|
- stacklevel = 2
|
||||||
|
- try:
|
||||||
|
- f = sys._getframe(1)
|
||||||
|
- except AttributeError:
|
||||||
|
- pass
|
||||||
|
- else:
|
||||||
|
- while f:
|
||||||
|
- module = f.f_globals.get('__name__')
|
||||||
|
- if not (module == 'asyncio' or module.startswith('asyncio.')):
|
||||||
|
- break
|
||||||
|
- f = f.f_back
|
||||||
|
- stacklevel += 1
|
||||||
|
- import warnings
|
||||||
|
- warnings.warn('There is no current event loop',
|
||||||
|
- DeprecationWarning, stacklevel=stacklevel)
|
||||||
|
self.set_event_loop(self.new_event_loop())
|
||||||
|
|
||||||
|
if self._local._loop is None:
|
||||||
|
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
|
||||||
|
index c431fea401..18c4fd15d9 100644
|
||||||
|
--- a/Lib/test/test_asyncio/test_events.py
|
||||||
|
+++ b/Lib/test/test_asyncio/test_events.py
|
||||||
|
@@ -2547,9 +2547,7 @@ def test_event_loop_policy(self):
|
||||||
|
def test_get_event_loop(self):
|
||||||
|
policy = asyncio.DefaultEventLoopPolicy()
|
||||||
|
self.assertIsNone(policy._local._loop)
|
||||||
|
- with self.assertWarns(DeprecationWarning) as cm:
|
||||||
|
- loop = policy.get_event_loop()
|
||||||
|
- self.assertEqual(cm.filename, __file__)
|
||||||
|
+ loop = policy.get_event_loop()
|
||||||
|
self.assertIsInstance(loop, asyncio.AbstractEventLoop)
|
||||||
|
|
||||||
|
self.assertIs(policy._local._loop, loop)
|
||||||
|
@@ -2563,10 +2561,8 @@ def test_get_event_loop_calls_set_event_loop(self):
|
||||||
|
policy, "set_event_loop",
|
||||||
|
wraps=policy.set_event_loop) as m_set_event_loop:
|
||||||
|
|
||||||
|
- with self.assertWarns(DeprecationWarning) as cm:
|
||||||
|
- loop = policy.get_event_loop()
|
||||||
|
+ loop = policy.get_event_loop()
|
||||||
|
self.addCleanup(loop.close)
|
||||||
|
- self.assertEqual(cm.filename, __file__)
|
||||||
|
|
||||||
|
# policy._local._loop must be set through .set_event_loop()
|
||||||
|
# (the unix DefaultEventLoopPolicy needs this call to attach
|
||||||
|
@@ -2755,10 +2751,8 @@ def test_get_event_loop_returns_running_loop2(self):
|
||||||
|
loop = asyncio.new_event_loop()
|
||||||
|
self.addCleanup(loop.close)
|
||||||
|
|
||||||
|
- with self.assertWarns(DeprecationWarning) as cm:
|
||||||
|
- loop2 = asyncio.get_event_loop()
|
||||||
|
+ loop2 = asyncio.get_event_loop()
|
||||||
|
self.addCleanup(loop2.close)
|
||||||
|
- self.assertEqual(cm.filename, __file__)
|
||||||
|
asyncio.set_event_loop(None)
|
||||||
|
with self.assertRaisesRegex(RuntimeError, 'no current'):
|
||||||
|
asyncio.get_event_loop()
|
||||||
|
diff --git a/Misc/NEWS.d/next/Library/2022-12-21-18-29-24.gh-issue-100160.isBmL5.rst b/Misc/NEWS.d/next/Library/2022-12-21-18-29-24.gh-issue-100160.isBmL5.rst
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000..c3b518ca85
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/Misc/NEWS.d/next/Library/2022-12-21-18-29-24.gh-issue-100160.isBmL5.rst
|
||||||
|
@@ -0,0 +1,2 @@
|
||||||
|
+Remove any deprecation warnings in :func:`asyncio.get_event_loop`. They are
|
||||||
|
+deferred to Python 3.12.
|
@ -327,6 +327,12 @@ Patch371: 00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-g
|
|||||||
# GH-100133: fix `asyncio` subprocess losing `stderr` and `stdout` output
|
# GH-100133: fix `asyncio` subprocess losing `stderr` and `stdout` output
|
||||||
Patch395: 00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch
|
Patch395: 00395-gh-100133-fix-asyncio-subprocess-losing-stderr-and-stdout-output.patch
|
||||||
|
|
||||||
|
# 00396 # 4c775fbed65016fec5dfd66316559024d2af9135
|
||||||
|
# gh-100160: Remove any deprecation warnings in asyncio.get_event_loop()
|
||||||
|
#
|
||||||
|
# Some deprecation warnings will reappear (in a slightly different form) in 3.12.
|
||||||
|
Patch396: 00396-gh-100160-remove-any-deprecation-warnings-in-asyncio-get_event_loop.patch
|
||||||
|
|
||||||
# (New patches go here ^^^)
|
# (New patches go here ^^^)
|
||||||
#
|
#
|
||||||
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
|
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
|
||||||
@ -1601,6 +1607,7 @@ CheckPython optimized
|
|||||||
%changelog
|
%changelog
|
||||||
* Fri Jan 06 2023 Miro Hrončok <mhroncok@redhat.com> - 3.11.1-3
|
* Fri Jan 06 2023 Miro Hrončok <mhroncok@redhat.com> - 3.11.1-3
|
||||||
- Fix `asyncio` subprocess losing `stderr` and `stdout` output
|
- Fix `asyncio` subprocess losing `stderr` and `stdout` output
|
||||||
|
- Remove any deprecation warnings in asyncio.get_event_loop()
|
||||||
|
|
||||||
* Wed Dec 07 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.11.1-1
|
* Wed Dec 07 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.11.1-1
|
||||||
- Update to 3.11.1
|
- Update to 3.11.1
|
||||||
|
Loading…
Reference in New Issue
Block a user