Rm _busy_wait()

Author: giampaolo

Lib/subprocess.py

@@ -2112,29 +2112,6 @@ def _wait_kqueue(self, timeout):
             finally:
                 kq.close()
 
-        def _busy_wait(self, timeout):
-            endtime = _time() + timeout
-            # Enter a busy loop if we have a timeout.  This busy loop was
-            # cribbed from Lib/threading.py in Thread.wait() at r71065.
-            delay = 0.0005 # 500 us -> initial delay of 1 ms
-            while True:
-                if self._waitpid_lock.acquire(False):
-                    try:
-                        if self.returncode is not None:
-                            break  # Another thread waited.
-                        (pid, sts) = self._try_wait(os.WNOHANG)
-                        assert pid == self.pid or pid == 0
-                        if pid == self.pid:
-                            self._handle_exitstatus(sts)
-                            break
-                    finally:
-                        self._waitpid_lock.release()
-                remaining = self._remaining_time(endtime)
-                if remaining <= 0:
-                    raise TimeoutExpired(self.args, timeout)
-                delay = min(delay * 2, remaining, .05)
-                time.sleep(delay)
-
         def _wait(self, timeout):
             """Internal implementation of wait() on POSIX.
 
@@ -2155,8 +2132,29 @@ def _wait(self, timeout):
                         if pid == self.pid:
                             self._handle_exitstatus(sts)
                             return self.returncode
-                else:
-                    self._busy_wait(timeout)
+                        return None
+
+                # Enter a busy loop if we have a timeout.  This busy loop was
+                # cribbed from Lib/threading.py in Thread.wait() at r71065.
+                endtime = _time() + timeout
+                delay = 0.0005 # 500 us -> initial delay of 1 ms
+                while True:
+                    if self._waitpid_lock.acquire(False):
+                        try:
+                            if self.returncode is not None:
+                                break  # Another thread waited.
+                            (pid, sts) = self._try_wait(os.WNOHANG)
+                            assert pid == self.pid or pid == 0
+                            if pid == self.pid:
+                                self._handle_exitstatus(sts)
+                                break
+                        finally:
+                            self._waitpid_lock.release()
+                    remaining = self._remaining_time(endtime)
+                    if remaining <= 0:
+                        raise TimeoutExpired(self.args, timeout)
+                    delay = min(delay * 2, remaining, .05)
+                    time.sleep(delay)
             else:
                 while self.returncode is None:
                     with self._waitpid_lock: