cpython: a80abb179ba1 (original) (raw)
Mercurial > cpython
changeset 82005:a80abb179ba1
merge #17091: update docstring for _thread.Lock.acquire. [#17091]
| R David Murray rdmurray@bitdance.com | |
|---|---|
| date | Mon, 04 Feb 2013 10:25:51 -0500 |
| parents | 288088d5a9b7(current diff)b414b2dfd3d3(diff) |
| children | c4e6e560e6f5 |
| files | Modules/_threadmodule.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-)[+] [-] Modules/_threadmodule.c 4 |
line wrap: on
line diff
--- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -145,12 +145,12 @@ lock_PyThread_acquire_lock(lockobject *s } PyDoc_STRVAR(acquire_doc, -"acquire([wait]) -> None or bool\n[](#l1.7) +"acquire([wait]) -> bool\n[](#l1.8) (acquire_lock() is an obsolete synonym)\n[](#l1.9) \n[](#l1.10) Lock the lock. Without argument, this blocks if the lock is already\n[](#l1.11) locked (even by the same thread), waiting for another thread to release\n[](#l1.12) -the lock, and return None once the lock is acquired.\n[](#l1.13) +the lock, and return True once the lock is acquired.\n[](#l1.14) With an argument, this will only block if the argument is true,\n[](#l1.15) and the return value reflects whether the lock is acquired.\n[](#l1.16) The blocking operation is interruptible.");