May 5, 2025 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025 · May 3, 2025 · May 3, 2025
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
            if self.returncode is not None:
                return self.returncode

            if timeout is not None and timeout > 0:
            if timeout is not None:
                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.
                        finally:
                            self._waitpid_lock.release()
                    remaining = self._remaining_time(endtime)
                    if remaining < 0:
                    if remaining <= 0:
                        raise TimeoutExpired(self.args, timeout)
                    delay = min(delay * 2, remaining, .05)
                    time.sleep(delay)
                                selector.unregister(key.fileobj)
                                key.fileobj.close()
                            self._fileobj2output[key.fileobj].append(data)

            self.wait(timeout=self._remaining_time(endtime))
            try:
                self.wait(timeout=self._remaining_time(endtime))
            except TimeoutExpired:
                raise TimeoutExpired(self.args, orig_timeout)

            # All data exchanged.  Translate lists into strings.
            if stdout is not None:
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
        # child.
        with self.assertRaises(subprocess.TimeoutExpired):
            self.run_python("while True: pass", timeout=0.0001)
    def test_timeout_zero(self):
        self.run_python("import time; time.sleep(0.1)", timeout=0)

    def test_capture_stdout(self):
        # capture stdout with zero return code
diff --git a/Misc/NEWS.d/next/Library/2025-04-29-02-23-04.gh-issue-133089.8Jy1ZS.rst b/Misc/NEWS.d/next/Library/2025-04-29-02-23-04.gh-issue-133089.8Jy1ZS.rst
 Make :func:`subprocess.run`'s behavior is same with 'timeout=None' when
 thetimeoutiszero
 Use origional timeout value for :exc:`TimeoutExpired`
 whenthefunc :meth:`subprocess.run`iscalled with a timeout
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2031,7 +2031,7 @@ def _wait(self, timeout):
		if self.returncode is not None:
		return self.returncode

		if timeout is not None and timeout > 0:
		if timeout is not None:
		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.
Expand All		@@ -2049,7 +2049,7 @@ def _wait(self, timeout):
		finally:
		self._waitpid_lock.release()
		remaining = self._remaining_time(endtime)
		if remaining < 0:
		if remaining <= 0:
		raise TimeoutExpired(self.args, timeout)
		delay = min(delay * 2, remaining, .05)
		time.sleep(delay)
Expand DownExpand Up		@@ -2145,8 +2145,10 @@ def _communicate(self, input, endtime, orig_timeout):
		selector.unregister(key.fileobj)
		key.fileobj.close()
		self._fileobj2output[key.fileobj].append(data)

		self.wait(timeout=self._remaining_time(endtime))
		try:
		self.wait(timeout=self._remaining_time(endtime))
		except TimeoutExpired:
		raise TimeoutExpired(self.args, orig_timeout)

		# All data exchanged. Translate lists into strings.
		if stdout is not None:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1660,8 +1660,6 @@ def test_timeout(self):
		# child.
		with self.assertRaises(subprocess.TimeoutExpired):
		self.run_python("while True: pass", timeout=0.0001)
		def test_timeout_zero(self):
		self.run_python("import time; time.sleep(0.1)", timeout=0)

		def test_capture_stdout(self):
		# capture stdout with zero return code
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		Make :func:`subprocess.run`'s behavior is same with 'timeout=None' when
		thetimeoutiszero
		Use origional timeout value for :exc:`TimeoutExpired`
		whenthefunc :meth:`subprocess.run`iscalled with a timeout