From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 13 Jan 2015 15:11:19 +0000 (+0100)
Subject: Issue #22922: Fix ProactorEventLoop.close()
X-Git-Tag: v3.4.3rc1~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b86a96802bf7e054b7b219ee7e9c8fa2444f94d6;p=python

Issue #22922: Fix ProactorEventLoop.close()

Close the IocpProactor before closing the event loop. IocpProactor.close() can
call loop.call_soon(), which is forbidden when the event loop is closed.
---

diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index 0a4d068554..5986e37f6b 100644
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -387,13 +387,19 @@ class BaseProactorEventLoop(base_events.BaseEventLoop):
             raise RuntimeError("Cannot close a running event loop")
         if self.is_closed():
             return
+
+        # Call these methods before closing the event loop (before calling
+        # BaseEventLoop.close), because they can schedule callbacks with
+        # call_soon(), which is forbidden when the event loop is closed.
         self._stop_accept_futures()
         self._close_self_pipe()
-        super().close()
         self._proactor.close()
         self._proactor = None
         self._selector = None
 
+        # Close the event loop
+        super().close()
+
     def sock_recv(self, sock, n):
         return self._proactor.recv(sock, n)