mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-10 19:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

GH-90985: Revert "Deprecate passing a message into cancel()" (#97999)

Browse source 
Reason: we were too hasty in deprecating this.
We shouldn't deprecate it before we have a replacement.
This commit is contained in:
Guido van Rossum 2022-10-06 17:30:27 -07:00 • committed by GitHub
parent c46a423a52
commit 09de8d7aaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Lib/test/test_asyncio/test_tasks.py
View file

@ -109,11 +109,7 @@ class BaseTaskTests:
self.assertTrue(hasattr(t, '_cancel_message'))
self.assertEqual(t._cancel_message, None)
with self.assertWarnsRegex(
DeprecationWarning,
"Passing 'msg' argument"
):
t.cancel('my message')
t.cancel('my message')
self.assertEqual(t._cancel_message, 'my message')
with self.assertRaises(asyncio.CancelledError) as cm:
@ -125,11 +121,7 @@ class BaseTaskTests:
async def coro():
pass
t = self.new_task(self.loop, coro())
with self.assertWarnsRegex(
DeprecationWarning,
"Passing 'msg' argument"
):
t.cancel('my message')
t.cancel('my message')
t._cancel_message = 'my new message'
self.assertEqual(t._cancel_message, 'my new message')
@ -706,14 +698,7 @@ class BaseTaskTests:
async def coro():
task = self.new_task(loop, sleep())
await asyncio.sleep(0)
if cancel_args not in ((), (None,)):
with self.assertWarnsRegex(
DeprecationWarning,
"Passing 'msg' argument"
):
task.cancel(*cancel_args)
else:
task.cancel(*cancel_args)
task.cancel(*cancel_args)
done, pending = await asyncio.wait([task])
task.result()
@ -747,14 +732,7 @@ class BaseTaskTests:
async def coro():
task = self.new_task(loop, sleep())
await asyncio.sleep(0)
if cancel_args not in ((), (None,)):
with self.assertWarnsRegex(
DeprecationWarning,
"Passing 'msg' argument"
):
task.cancel(*cancel_args)
else:
task.cancel(*cancel_args)
task.cancel(*cancel_args)
done, pending = await asyncio.wait([task])
task.exception()
@ -777,17 +755,10 @@ class BaseTaskTests:
fut.set_result(None)
await asyncio.sleep(10)
def cancel(task, msg):
with self.assertWarnsRegex(
DeprecationWarning,
"Passing 'msg' argument"
):
task.cancel(msg)
async def coro():
inner_task = self.new_task(loop, sleep())
await fut
loop.call_soon(cancel, inner_task, 'msg')
loop.call_soon(inner_task.cancel, 'msg')
try:
await inner_task
except asyncio.CancelledError as ex:
@ -813,11 +784,7 @@ class BaseTaskTests:
async def coro():
task = self.new_task(loop, sleep())
# We deliberately leave out the sleep here.
with self.assertWarnsRegex(
DeprecationWarning,
"Passing 'msg' argument"
):
task.cancel('my message')
task.cancel('my message')
done, pending = await asyncio.wait([task])
task.exception()
@ -2179,14 +2146,7 @@ class BaseTaskTests:
async def main():
qwe = self.new_task(loop, test())
await asyncio.sleep(0.2)
if cancel_args not in ((), (None,)):
with self.assertWarnsRegex(
DeprecationWarning,
"Passing 'msg' argument"
):
qwe.cancel(*cancel_args)
else:
qwe.cancel(*cancel_args)
qwe.cancel(*cancel_args)
await qwe
try: