- Issue #22841: Reject coroutines in asyncio add_signal_handler().
Patch by Ludovic.Gasc.
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
index b16f946..e49212e 100644
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -13,6 +13,7 @@
from . import base_events
from . import base_subprocess
from . import constants
+from . import coroutines
from . import events
from . import selector_events
from . import selectors
@@ -66,6 +67,8 @@
Raise ValueError if the signal number is invalid or uncatchable.
Raise RuntimeError if there is a problem setting up the handler.
"""
+ if coroutines.iscoroutinefunction(callback):
+ raise TypeError("coroutines cannot be used with call_soon()")
self._check_signal(sig)
try:
# set_wakeup_fd() raises ValueError if this is not the
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index e397598..2f3fa18 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -64,6 +64,18 @@
signal.SIGINT, lambda: True)
@mock.patch('asyncio.unix_events.signal')
+ def test_add_signal_handler_coroutine_error(self, m_signal):
+
+ @asyncio.coroutine
+ def simple_coroutine():
+ yield from []
+
+ self.assertRaises(
+ TypeError,
+ self.loop.add_signal_handler,
+ signal.SIGINT, simple_coroutine)
+
+ @mock.patch('asyncio.unix_events.signal')
def test_add_signal_handler(self, m_signal):
m_signal.NSIG = signal.NSIG
diff --git a/Misc/NEWS b/Misc/NEWS
index bb58965..6a4b81f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -36,6 +36,9 @@
Library
-------
+- Issue #22841: Reject coroutines in asyncio add_signal_handler().
+ Patch by Ludovic.Gasc.
+
- Issue #22849: Fix possible double free in the io.TextIOWrapper constructor.
- Issue #12728: Different Unicode characters having the same uppercase but