From: Mario Corchero <mcorcherojim@bloomberg.net>
Date: Mon, 10 Jul 2023 13:35:54 +0000 (+0200)
Subject: GH-61215: threadingmock: Remove unused branch for `timeout` (#106591)
X-Git-Tag: v3.13.0a1~1453
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e23fa71f43fb225ca29a931644d1100e2f4d6b8;p=thirdparty%2FPython%2Fcpython.git

GH-61215: threadingmock: Remove unused branch for `timeout` (#106591)

threadingmock: Remove unused branch for `timeout`

This is no longer needed as the mock does not hold a "timeout"
parameter, the timeout is stored in `_mock_wait_timeout`.
---

diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 7ef7e7180b31..3ed54b3ba230 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -3012,9 +3012,7 @@ class ThreadingMixin(Base):
     DEFAULT_TIMEOUT = None
 
     def _get_child_mock(self, /, **kw):
-        if "timeout" in kw:
-            kw["timeout"] = kw.pop("timeout")
-        elif isinstance(kw.get("parent"), ThreadingMixin):
+        if isinstance(kw.get("parent"), ThreadingMixin):
             kw["timeout"] = kw["parent"]._mock_wait_timeout
         elif isinstance(kw.get("_new_parent"), ThreadingMixin):
             kw["timeout"] = kw["_new_parent"]._mock_wait_timeout