rework

python · gvanrossum · Oct 5, 2022 · Mar 23, 2022 · Mar 24, 2022 · Mar 24, 2022
commit 0b87f8d2d9a84bf89bbf174a71e638615b1db43c
@@ -214,23 +214,15 @@ def _process_exited(self, returncode):
             # asyncio uses a child watcher: copy the status into the Popen
             # object. On Python 3.6, it is required to avoid a ResourceWarning.
             self._proc.returncode = returncode
-
-        def __process_exited():
-            self._protocol.process_exited()
-            # Since process exited, clear all pipes
-            for proto in self._pipes.values():
-                if proto is None:
-                    continue
-                proto.pipe.close()
-            # Call _wait waiters
-            for waiter in self._exit_waiters:
-                if not waiter.cancelled():
-                    waiter.set_result(self._returncode)
-            self._exit_waiters = None
-
-        self._call(__process_exited)
+        self._call(self._protocol.process_exited)
         self._try_finish()
 
+        # wake up futures waiting for wait()
+        for waiter in self._exit_waiters:
+            if not waiter.cancelled():
+                waiter.set_result(returncode)
+        self._exit_waiters = None
+
     async def _wait(self):
         """Wait until the process exit and return the process return code.
 
@@ -260,7 +252,6 @@ def _call_connection_lost(self, exc):
             self._protocol = None
 
 
-
 class WriteSubprocessPipeProto(protocols.BaseProtocol):
 
     def __init__(self, proc, fd):

diff --git a/Lib/asyncio/subprocess.py b/Lib/asyncio/subprocess.py
@@ -103,7 +103,9 @@ def process_exited(self):
         self._maybe_close_transport()
 
     def _maybe_close_transport(self):
-        if len(self._pipe_fds) == 0 and self._process_exited:
+        # Since process already exited
+        # clear all the pipes and close transport
+        if self._process_exited and self._transport:
             self._transport.close()
             self._transport = None