summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-02-04 15:25:51 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-02-04 15:25:51 (GMT)
commit811724ce7fd339cceffd69b0827a6a123c49b4ff (patch)
tree4514aac3bbf013da6f5e9804e2b36485441b76d5
parent034a3b5221787d5ad539e1068edcdac453fa0a42 (diff)
parentb7be42b1f949a4ddd6fe9a2d2b6451fba565c037 (diff)
downloadcpython-811724ce7fd339cceffd69b0827a6a123c49b4ff.zip
cpython-811724ce7fd339cceffd69b0827a6a123c49b4ff.tar.gz
cpython-811724ce7fd339cceffd69b0827a6a123c49b4ff.tar.bz2
merge #17091: update docstring for _thread.Lock.acquire.
-rw-r--r--Modules/_threadmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 89ef7ba..cbb2901 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -145,12 +145,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.");