summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-02-04 15:15:58 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-02-04 15:15:58 (GMT)
commit95b7110a1145d28fd9786c101ad568c7a2e4fb6e (patch)
treeee2f68e8994359c504f32d8d715c07223ab5ace3
parentdb1ba4eeac9ac664847caa51189c123707ae1806 (diff)
downloadcpython-95b7110a1145d28fd9786c101ad568c7a2e4fb6e.zip
cpython-95b7110a1145d28fd9786c101ad568c7a2e4fb6e.tar.gz
cpython-95b7110a1145d28fd9786c101ad568c7a2e4fb6e.tar.bz2
#17091: update docstring for _thread.Lock.acquire.
The main docs were fixed to remove mention of None long ago, but the docstring was not. Reported by Armin Rigo, patch by Ian Cordasco.
-rw-r--r--Modules/_threadmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 5f76a7b..4f8ec2d 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -138,12 +138,12 @@ lock_PyThread_acquire_lock(lockobject *self, PyObject *args, PyObject *kwds)
}
PyDoc_STRVAR(acquire_doc,
-"acquire([wait]) -> None or bool\n\
+"acquire([wait]) -> bool\n\
(acquire_lock() is an obsolete synonym)\n\
\n\
Lock the lock. Without argument, this blocks if the lock is already\n\
locked (even by the same thread), waiting for another thread to release\n\
-the lock, and return None once the lock is acquired.\n\
+the lock, and return True once the lock is acquired.\n\
With an argument, this will only block if the argument is true,\n\
and the return value reflects whether the lock is acquired.\n\
The blocking operation is interruptible.");