mirror of
https://github.com/python/cpython.git
synced 2025-07-23 11:15:24 +00:00
[3.11] gh-93453: Only emit deprecation warning in asyncio.get_event_loop when a new event loop is created (#99949)
It no longer emits a deprecation warning if the current event loop was set. Co-authored-by: Łukasz Langa <lukasz@langa.pl>
This commit is contained in:
parent
235f5fd2ca
commit
3fae04b10e
13 changed files with 109 additions and 123 deletions
|
@ -2547,8 +2547,9 @@ class PolicyTests(unittest.TestCase):
|
|||
def test_get_event_loop(self):
|
||||
policy = asyncio.DefaultEventLoopPolicy()
|
||||
self.assertIsNone(policy._local._loop)
|
||||
|
||||
loop = policy.get_event_loop()
|
||||
with self.assertWarns(DeprecationWarning) as cm:
|
||||
loop = policy.get_event_loop()
|
||||
self.assertEqual(cm.filename, __file__)
|
||||
self.assertIsInstance(loop, asyncio.AbstractEventLoop)
|
||||
|
||||
self.assertIs(policy._local._loop, loop)
|
||||
|
@ -2562,7 +2563,10 @@ class PolicyTests(unittest.TestCase):
|
|||
policy, "set_event_loop",
|
||||
wraps=policy.set_event_loop) as m_set_event_loop:
|
||||
|
||||
loop = policy.get_event_loop()
|
||||
with self.assertWarns(DeprecationWarning) as cm:
|
||||
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
|
||||
|
@ -2596,7 +2600,8 @@ class PolicyTests(unittest.TestCase):
|
|||
|
||||
def test_set_event_loop(self):
|
||||
policy = asyncio.DefaultEventLoopPolicy()
|
||||
old_loop = policy.get_event_loop()
|
||||
old_loop = policy.new_event_loop()
|
||||
policy.set_event_loop(old_loop)
|
||||
|
||||
self.assertRaises(TypeError, policy.set_event_loop, object())
|
||||
|
||||
|
@ -2709,15 +2714,11 @@ class GetEventLoopTestsMixin:
|
|||
asyncio.set_event_loop_policy(Policy())
|
||||
loop = asyncio.new_event_loop()
|
||||
|
||||
with self.assertWarns(DeprecationWarning) as cm:
|
||||
with self.assertRaises(TestError):
|
||||
asyncio.get_event_loop()
|
||||
self.assertEqual(cm.filename, __file__)
|
||||
with self.assertRaises(TestError):
|
||||
asyncio.get_event_loop()
|
||||
asyncio.set_event_loop(None)
|
||||
with self.assertWarns(DeprecationWarning) as cm:
|
||||
with self.assertRaises(TestError):
|
||||
asyncio.get_event_loop()
|
||||
self.assertEqual(cm.filename, __file__)
|
||||
with self.assertRaises(TestError):
|
||||
asyncio.get_event_loop()
|
||||
|
||||
with self.assertRaisesRegex(RuntimeError, 'no running'):
|
||||
asyncio.get_running_loop()
|
||||
|
@ -2731,16 +2732,11 @@ class GetEventLoopTestsMixin:
|
|||
loop.run_until_complete(func())
|
||||
|
||||
asyncio.set_event_loop(loop)
|
||||
with self.assertWarns(DeprecationWarning) as cm:
|
||||
with self.assertRaises(TestError):
|
||||
asyncio.get_event_loop()
|
||||
self.assertEqual(cm.filename, __file__)
|
||||
|
||||
with self.assertRaises(TestError):
|
||||
asyncio.get_event_loop()
|
||||
asyncio.set_event_loop(None)
|
||||
with self.assertWarns(DeprecationWarning) as cm:
|
||||
with self.assertRaises(TestError):
|
||||
asyncio.get_event_loop()
|
||||
self.assertEqual(cm.filename, __file__)
|
||||
with self.assertRaises(TestError):
|
||||
asyncio.get_event_loop()
|
||||
|
||||
finally:
|
||||
asyncio.set_event_loop_policy(old_policy)
|
||||
|
@ -2764,10 +2760,8 @@ class GetEventLoopTestsMixin:
|
|||
self.addCleanup(loop2.close)
|
||||
self.assertEqual(cm.filename, __file__)
|
||||
asyncio.set_event_loop(None)
|
||||
with self.assertWarns(DeprecationWarning) as cm:
|
||||
with self.assertRaisesRegex(RuntimeError, 'no current'):
|
||||
asyncio.get_event_loop()
|
||||
self.assertEqual(cm.filename, __file__)
|
||||
with self.assertRaisesRegex(RuntimeError, 'no current'):
|
||||
asyncio.get_event_loop()
|
||||
|
||||
with self.assertRaisesRegex(RuntimeError, 'no running'):
|
||||
asyncio.get_running_loop()
|
||||
|
@ -2781,15 +2775,11 @@ class GetEventLoopTestsMixin:
|
|||
loop.run_until_complete(func())
|
||||
|
||||
asyncio.set_event_loop(loop)
|
||||
with self.assertWarns(DeprecationWarning) as cm:
|
||||
self.assertIs(asyncio.get_event_loop(), loop)
|
||||
self.assertEqual(cm.filename, __file__)
|
||||
self.assertIs(asyncio.get_event_loop(), loop)
|
||||
|
||||
asyncio.set_event_loop(None)
|
||||
with self.assertWarns(DeprecationWarning) as cm:
|
||||
with self.assertRaisesRegex(RuntimeError, 'no current'):
|
||||
asyncio.get_event_loop()
|
||||
self.assertEqual(cm.filename, __file__)
|
||||
with self.assertRaisesRegex(RuntimeError, 'no current'):
|
||||
asyncio.get_event_loop()
|
||||
|
||||
finally:
|
||||
asyncio.set_event_loop_policy(old_policy)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue