diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/asyncio/proactor_events.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_windows_events.py | 19 |
2 files changed, 23 insertions, 1 deletions
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py index 9b8ae06..229f56e 100644 --- a/Lib/asyncio/proactor_events.py +++ b/Lib/asyncio/proactor_events.py @@ -11,6 +11,7 @@ import os import socket import warnings import signal +import threading import collections from . import base_events @@ -627,7 +628,9 @@ class BaseProactorEventLoop(base_events.BaseEventLoop): proactor.set_loop(self) self._make_self_pipe() self_no = self._csock.fileno() - signal.set_wakeup_fd(self_no) + if threading.current_thread() is threading.main_thread(): + # wakeup fd can only be installed to a file descriptor from the main thread + signal.set_wakeup_fd(self_no) def _make_socket_transport(self, sock, protocol, waiter=None, extra=None, server=None): diff --git a/Lib/test/test_asyncio/test_windows_events.py b/Lib/test/test_asyncio/test_windows_events.py index 6454326..d0ba193 100644 --- a/Lib/test/test_asyncio/test_windows_events.py +++ b/Lib/test/test_asyncio/test_windows_events.py @@ -59,6 +59,25 @@ class ProactorLoopCtrlC(test_utils.TestCase): thread.join() +class ProactorMultithreading(test_utils.TestCase): + def test_run_from_nonmain_thread(self): + finished = False + + async def coro(): + await asyncio.sleep(0) + + def func(): + nonlocal finished + loop = asyncio.new_event_loop() + loop.run_until_complete(coro()) + finished = True + + thread = threading.Thread(target=func) + thread.start() + thread.join() + self.assertTrue(finished) + + class ProactorTests(test_utils.TestCase): def setUp(self): |