summaryrefslogtreecommitdiff
path: root/Modules/_threadmodule.c
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-02-04 10:22:39 -0500
committerR David Murray <rdmurray@bitdance.com>2013-02-04 10:22:39 -0500
commit006ec7e65452a192bdb0b68672745470ed2167cc (patch)
tree11a10ee7981c281a5529c9faa31dbd7dfe91c2e8 /Modules/_threadmodule.c
parente095b8bae062e09d7ee99ec1edc92d53fde343d3 (diff)
parentdfe166d1b07f3658e59622326f16fbceaf0c6e02 (diff)
downloadcpython-006ec7e65452a192bdb0b68672745470ed2167cc.tar.gz
merge #17091: update docstring for _thread.Lock.acquire.
Diffstat (limited to 'Modules/_threadmodule.c')
-rw-r--r--Modules/_threadmodule.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 63efdc3207..d1dc61d0b1 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.");