Commit 8fdc75ba authored by Guido van Rossum's avatar Guido van Rossum

Lock methods acquire() and locked() now return bools.

parent 7f7666ff
...@@ -68,17 +68,17 @@ lock_PyThread_acquire_lock(lockobject *self, PyObject *args) ...@@ -68,17 +68,17 @@ lock_PyThread_acquire_lock(lockobject *self, PyObject *args)
return Py_None; return Py_None;
} }
else else
return PyInt_FromLong((long)i); return PyBool_FromLong((long)i);
} }
static char acquire_doc[] = static char acquire_doc[] =
"acquire([wait]) -> None or Boolean\n\ "acquire([wait]) -> None or bool\n\
(PyThread_acquire_lock() is an obsolete synonym)\n\ (PyThread_acquire_lock() is an obsolete synonym)\n\
\n\ \n\
Lock the lock. Without argument, this blocks if the lock is already\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\ locked (even by the same thread), waiting for another thread to release\n\
the lock, and return None when the lock is acquired.\n\ the lock, and return None once the lock is acquired.\n\
With a Boolean argument, this will only block if the argument is true,\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\ and the return value reflects whether the lock is acquired.\n\
The blocking operation is not interruptible."; The blocking operation is not interruptible.";
...@@ -110,13 +110,13 @@ lock_locked_lock(lockobject *self) ...@@ -110,13 +110,13 @@ lock_locked_lock(lockobject *self)
{ {
if (PyThread_acquire_lock(self->lock_lock, 0)) { if (PyThread_acquire_lock(self->lock_lock, 0)) {
PyThread_release_lock(self->lock_lock); PyThread_release_lock(self->lock_lock);
return PyInt_FromLong(0L); return PyBool_FromLong(0L);
} }
return PyInt_FromLong(1L); return PyBool_FromLong(1L);
} }
static char locked_doc[] = static char locked_doc[] =
"locked() -> Boolean\n\ "locked() -> bool\n\
(locked_lock() is an obsolete synonym)\n\ (locked_lock() is an obsolete synonym)\n\
\n\ \n\
Return whether the lock is in the locked state."; Return whether the lock is in the locked state.";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment