summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTim Peters <tim@python.org>2013-10-26 16:56:16 (GMT)
committerTim Peters <tim@python.org>2013-10-26 16:56:16 (GMT)
commita577f1e0f15ca23e2916022009843b4c16ce5c96 (patch)
tree47fdee039e4f389737f522ed6aaa368f21bfb3d2 /Lib
parent367df120442bc592f7377bdfa6f4520426046c3f (diff)
downloadcpython-a577f1e0f15ca23e2916022009843b4c16ce5c96.zip
cpython-a577f1e0f15ca23e2916022009843b4c16ce5c96.tar.gz
cpython-a577f1e0f15ca23e2916022009843b4c16ce5c96.tar.bz2
Changed a comment to end grammar bikeshedding ;-)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/threading.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/threading.py b/Lib/threading.py
index 5d454b6..d907c89 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1061,7 +1061,7 @@ class Thread:
self._wait_for_tstate_lock()
else:
# the behavior of a negative timeout isn't documented, but
- # historically .join() has acted as if timeout=0 then
+ # historically .join(timeout=x) for x<0 has acted as if timeout=0
self._wait_for_tstate_lock(timeout=max(timeout, 0))
def _wait_for_tstate_lock(self, block=True, timeout=-1):