summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-02-04 15:22:39 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-02-04 15:22:39 (GMT)
commitb7be42b1f949a4ddd6fe9a2d2b6451fba565c037 (patch)
tree7ceaefe9be5a4459683b438cac749b99d914286c /Modules
parent8216be0940d8195f6e7704bfd958f82a6ee0c740 (diff)
parent95b7110a1145d28fd9786c101ad568c7a2e4fb6e (diff)
downloadcpython-b7be42b1f949a4ddd6fe9a2d2b6451fba565c037.zip
cpython-b7be42b1f949a4ddd6fe9a2d2b6451fba565c037.tar.gz
cpython-b7be42b1f949a4ddd6fe9a2d2b6451fba565c037.tar.bz2
merge #17091: update docstring for _thread.Lock.acquire.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_threadmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 63efdc3..d1dc61d 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.");