Commit d2c5fab7 authored by Yury Selivanov's avatar Yury Selivanov

Merge 3.5 (issue #28371)

parents 139914a0 0de3de6c
...@@ -606,6 +606,9 @@ class BaseEventLoop(events.AbstractEventLoop): ...@@ -606,6 +606,9 @@ class BaseEventLoop(events.AbstractEventLoop):
if isinstance(func, events.Handle): if isinstance(func, events.Handle):
assert not args assert not args
assert not isinstance(func, events.TimerHandle) assert not isinstance(func, events.TimerHandle)
warnings.warn(
"Passing Handle to loop.run_in_executor() is deprecated",
DeprecationWarning)
if func._cancelled: if func._cancelled:
f = self.create_future() f = self.create_future()
f.set_result(None) f.set_result(None)
......
...@@ -358,7 +358,8 @@ class BaseEventLoopTests(test_utils.TestCase): ...@@ -358,7 +358,8 @@ class BaseEventLoopTests(test_utils.TestCase):
h = asyncio.Handle(cb, (), self.loop) h = asyncio.Handle(cb, (), self.loop)
h.cancel() h.cancel()
f = self.loop.run_in_executor(None, h) with self.assertWarnsRegex(DeprecationWarning, "Passing Handle"):
f = self.loop.run_in_executor(None, h)
self.assertIsInstance(f, asyncio.Future) self.assertIsInstance(f, asyncio.Future)
self.assertTrue(f.done()) self.assertTrue(f.done())
self.assertIsNone(f.result()) self.assertIsNone(f.result())
...@@ -373,12 +374,14 @@ class BaseEventLoopTests(test_utils.TestCase): ...@@ -373,12 +374,14 @@ class BaseEventLoopTests(test_utils.TestCase):
self.loop.set_default_executor(executor) self.loop.set_default_executor(executor)
res = self.loop.run_in_executor(None, h) with self.assertWarnsRegex(DeprecationWarning, "Passing Handle"):
res = self.loop.run_in_executor(None, h)
self.assertIs(f, res) self.assertIs(f, res)
executor = mock.Mock() executor = mock.Mock()
executor.submit.return_value = f executor.submit.return_value = f
res = self.loop.run_in_executor(executor, h) with self.assertWarnsRegex(DeprecationWarning, "Passing Handle"):
res = self.loop.run_in_executor(executor, h)
self.assertIs(f, res) self.assertIs(f, res)
self.assertTrue(executor.submit.called) self.assertTrue(executor.submit.called)
......
...@@ -173,6 +173,8 @@ Library ...@@ -173,6 +173,8 @@ Library
- Issue #28370: Speedup asyncio.StreamReader.readexactly. - Issue #28370: Speedup asyncio.StreamReader.readexactly.
Patch by Коренберг Марк. Patch by Коренберг Марк.
- Issue #28371: Deprecate passing asyncio.Handles to run_in_executor.
Windows Windows
------- -------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment