diff -r c30a3a6f3b39 Modules/_threadmodule.c --- a/Modules/_threadmodule.c Thu Jan 30 16:05:28 2014 -0800 +++ b/Modules/_threadmodule.c Fri Jan 31 13:46:21 2014 -0600 @@ -147,7 +147,7 @@ } PyDoc_STRVAR(acquire_doc, -"acquire([wait]) -> bool\n\ +"acquire(blocking=True, timeout=-1) -> bool\n\ (acquire_lock() is an obsolete synonym)\n\ \n\ Lock the lock. Without argument, this blocks if the lock is already\n\ @@ -213,6 +213,7 @@ }; static PyTypeObject Locktype = { + /* To create a lock, call the PyThread_allocate_lock() function */ PyVarObject_HEAD_INIT(&PyType_Type, 0) "_thread.lock", /*tp_name*/ sizeof(lockobject), /*tp_size*/ @@ -1135,7 +1136,8 @@ "allocate_lock() -> lock object\n\ (allocate() is an obsolete synonym)\n\ \n\ -Create a new lock object. See help(LockType) for information about locks."); +Create a new lock object. See help(type(Lock())) for information about\n\ +locks."); static PyObject * thread_get_ident(PyObject *self) @@ -1327,7 +1329,7 @@ PyDoc_STRVAR(lock_doc, "A lock object is a synchronization primitive. To create a lock,\n\ -call the PyThread_allocate_lock() function. Methods are:\n\ +call the threading.Lock() function. Methods are:\n\ \n\ acquire() -- lock the lock, possibly blocking until it can be obtained\n\ release() -- unlock of the lock\n\