From e36fcde38309f116c6c06042ad80e7debb7db743 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Fri, 14 Nov 2014 11:45:47 -0800
Subject: - Issue #22841: Reject coroutines in asyncio add_signal_handler().  
 Patch by Ludovic.Gasc.

---
 Lib/asyncio/unix_events.py                |  3 +++
 Lib/test/test_asyncio/test_unix_events.py | 12 ++++++++++++
 Misc/NEWS                                 |  3 +++
 3 files changed, 18 insertions(+)

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 @@ import threading
 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 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop):
         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 @@ class SelectorEventLoopSignalTests(test_utils.TestCase):
             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 @@ Core and Builtins
 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
-- 
cgit v0.12