summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1998-05-29 17:47:10 (GMT)
committerGuido van Rossum <guido@python.org>1998-05-29 17:47:10 (GMT)
commitb39e461b89a587116b56f57a5e34ebb479466dd8 (patch)
treebd020809fee44e34156a5031cf45bf28c0eaf31f /Lib
parent6884af706bacfd77eb3fffb2622091c13d757ad2 (diff)
downloadcpython-b39e461b89a587116b56f57a5e34ebb479466dd8.zip
cpython-b39e461b89a587116b56f57a5e34ebb479466dd8.tar.gz
cpython-b39e461b89a587116b56f57a5e34ebb479466dd8.tar.bz2
Two places where _time() should be used said time.time(), which
doesn't work of course.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/threading.py4
1 files 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)