Commit 706e3ecf authored by Guido van Rossum's avatar Guido van Rossum

Two places where _time() should be used said time.time(), which

doesn't work of course.
parent e40dc30b
...@@ -416,9 +416,9 @@ class Thread(_Verbose): ...@@ -416,9 +416,9 @@ class Thread(_Verbose):
if __debug__: if __debug__:
self._note("%s.join(): thread stopped", self) self._note("%s.join(): thread stopped", self)
else: else:
deadline = time.time() + timeout deadline = _time() + timeout
while not self.__stopped: while not self.__stopped:
delay = deadline - time.time() delay = deadline - _time()
if delay <= 0: if delay <= 0:
if __debug__: if __debug__:
self._note("%s.join(): timed out", self) self._note("%s.join(): timed out", self)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment