(original) (raw)

changeset: 82005:a80abb179ba1 parent: 82002:288088d5a9b7 parent: 82004:b414b2dfd3d3 user: R David Murray rdmurray@bitdance.com date: Mon Feb 04 10:25:51 2013 -0500 files: Modules/_threadmodule.c description: merge #17091: update docstring for _thread.Lock.acquire. diff -r 288088d5a9b7 -r a80abb179ba1 Modules/_threadmodule.c --- a/Modules/_threadmodule.c Mon Feb 04 16:57:18 2013 +0200 +++ b/Modules/_threadmodule.c Mon Feb 04 10:25:51 2013 -0500 @@ -145,12 +145,12 @@ } 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."); /rdmurray@bitdance.com