From b39e461b89a587116b56f57a5e34ebb479466dd8 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 29 May 1998 17:47:10 +0000 Subject: Two places where _time() should be used said time.time(), which doesn't work of course. --- Lib/threading.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/threading.py b/Lib/threading.py index d2ab9ed..3b4b6b1 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -416,9 +416,9 @@ class Thread(_Verbose): if __debug__: self._note("%s.join(): thread stopped", self) else: - deadline = time.time() + timeout + deadline = _time() + timeout while not self.__stopped: - delay = deadline - time.time() + delay = deadline - _time() if delay <= 0: if __debug__: self._note("%s.join(): timed out", self) -- cgit v0.12