[Python-checkins] cpython (merge 3.2 -> 3.3): merge #17091: update docstring for _thread.Lock.acquire.

[r.david.murray]

http://hg.python.org/cpython/rev/b414b2dfd3d3
changeset:   82004:b414b2dfd3d3
branch:      3.3
parent:      82001:c3f0a0c825f6
parent:      82003:0cc51c04aa20
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Feb 04 10:22:39 2013 -0500
summary:
  merge #17091: update docstring for _thread.Lock.acquire.

files:
  Modules/_threadmodule.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -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.");

-- 
Repository URL: http://hg.python.org/cpython