diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-11-20 14:03:52 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-11-20 14:03:52 (GMT) |
commit | 2d99d93d11e7908a51fde8de27b7a3584d23cf46 (patch) | |
tree | e52008207c7b1af6298fd742551508e5f0215ec7 /Lib/asyncio/unix_events.py | |
parent | c1ad35aae84d5cda4f73696844a87d7764224150 (diff) | |
download | cpython-2d99d93d11e7908a51fde8de27b7a3584d23cf46.zip cpython-2d99d93d11e7908a51fde8de27b7a3584d23cf46.tar.gz cpython-2d99d93d11e7908a51fde8de27b7a3584d23cf46.tar.bz2 |
asyncio: Coroutine objects are now rejected with a TypeError by the following
functions:
* add_signal_handler()
* call_at()
* call_later()
* call_soon()
* call_soon_threadsafe()
* run_in_executor()
Fix also the error message of add_signal_handler() (fix the name of the
function).
Diffstat (limited to 'Lib/asyncio/unix_events.py')
-rw-r--r-- | Lib/asyncio/unix_events.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index e49212e..efe06d4 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -67,8 +67,9 @@ 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()") + if (coroutines.iscoroutine(callback) + or coroutines.iscoroutinefunction(callback)): + raise TypeError("coroutines cannot be used with add_signal_handler()") self._check_signal(sig) try: # set_wakeup_fd() raises ValueError if this is not the |