Address Sam's review

Author: vstinner

Python/thread.c

@@ -122,13 +122,7 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds,
         flags |= _PY_LOCK_HANDLE_SIGNALS;
     }
 
-    if (timeout < 0) {
-        PyMutex_Lock((PyMutex *)lock);
-        return PY_LOCK_ACQUIRED;
-    }
-    else {
-        return _PyMutex_LockTimed((PyMutex *)lock, timeout, flags);
-    }
+    return _PyMutex_LockTimed((PyMutex *)lock, timeout, flags);
 }
 
 void
@@ -140,20 +134,7 @@ PyThread_release_lock(PyThread_type_lock lock)
 int
 _PyThread_at_fork_reinit(PyThread_type_lock *lock)
 {
-    PyThread_type_lock new_lock = PyThread_allocate_lock();
-    if (new_lock == NULL) {
-        return -1;
-    }
-
-    /* bpo-6721, bpo-40089: The old lock can be in an inconsistent state.
-       fork() can be called in the middle of an operation on the lock done by
-       another thread. So don't call PyThread_free_lock(*lock).
-
-       Leak memory on purpose. Don't release the memory either since the
-       address of a mutex is relevant. Putting two mutexes at the same address
-       can lead to problems. */
-
-    *lock = new_lock;
+    _PyMutex_at_fork_reinit((PyMutex *)lock);
     return 0;
 }