[Python-checkins] GH-61215: threadingmock: Remove unused branch for `timeout` (#106591)

[cjw296]

https://github.com/python/cpython/commit/3e23fa71f43fb225ca29a931644d1100e2f4d6b8
commit: 3e23fa71f43fb225ca29a931644d1100e2f4d6b8
branch: main
author: Mario Corchero <mcorcherojim at bloomberg.net>
committer: cjw296 <chris at withers.org>
date: 2023-07-10T07:35:54-06:00
summary:

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`.

files:
M Lib/unittest/mock.py

diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 7ef7e7180b31c..3ed54b3ba230e 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