summaryrefslogtreecommitdiff
path: root/Lib/test/test_threading.py
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2011-03-17 11:16:38 -0700
committerBrett Cannon <brett@python.org>2011-03-17 11:16:38 -0700
commiteb8cee83833830630f9d7388bd09d1fcb638b1a2 (patch)
tree651105352b4f7b17a4e747886562546082e9aaee /Lib/test/test_threading.py
parentecc2db515202456a67e9702ed94ce19fe5b4711f (diff)
parente9ff2ef20488eb3d1e8bba04516939585f35a148 (diff)
downloadcpython-git-eb8cee83833830630f9d7388bd09d1fcb638b1a2.tar.gz
merge
Diffstat (limited to 'Lib/test/test_threading.py')
-rw-r--r--Lib/test/test_threading.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 029218d210..c107652d26 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -578,7 +578,7 @@ class ThreadJoinOnShutdown(BaseTestCase):
# This acquires the lock and then waits until the child has forked
# before returning, which will release the lock soon after. If
# someone else tries to fix this test case by acquiring this lock
- # before forking instead of reseting it, the test case will
+ # before forking instead of resetting it, the test case will
# deadlock when it shouldn't.
condition = w._block
orig_acquire = condition.acquire