From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 19 Oct 2013 22:54:10 +0000 (+0200)
Subject: Issue #19299: fix refleak test failures in test_asyncio
X-Git-Tag: v3.4.0a4~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ca7355901049ff9a873cf236091e6780d7a8126;p=thirdparty%2FPython%2Fcpython.git

Issue #19299: fix refleak test failures in test_asyncio
---

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 5f1bff71f2df..2e0071374142 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -185,6 +185,14 @@ class BaseEventLoop(events.AbstractEventLoop):
         """
         self.call_soon(_raise_stop_error)
 
+    def close(self):
+        self._ready.clear()
+        self._scheduled.clear()
+        executor = self._default_executor
+        if executor is not None:
+            self._default_executor = None
+            executor.shutdown(wait=False)
+
     def is_running(self):
         """Returns running status of event loop."""
         return self._running
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index 665569f03a7e..cb8625d94297 100644
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -276,6 +276,7 @@ class BaseProactorEventLoop(base_events.BaseEventLoop):
             self._proactor.close()
             self._proactor = None
             self._selector = None
+            super().close()
 
     def sock_recv(self, sock, n):
         return self._proactor.recv(sock, n)
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index dee23064b7b6..6cffdd4e3540 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -56,6 +56,7 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop):
             self._close_self_pipe()
             self._selector.close()
             self._selector = None
+            super().close()
 
     def _socketpair(self):
         raise NotImplementedError