summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2002-04-07 06:32:21 (GMT)
committerGuido van Rossum <guido@python.org>2002-04-07 06:32:21 (GMT)
commit8fdc75ba5ebf82f0cd6fa2788433d26e12b93669 (patch)
treef5de5e6a11787a3c9ee8744c576a88ae378bc8d5 /Modules
parent7f7666ff437c4acb267823d3b37ba3248afe4623 (diff)
downloadcpython-8fdc75ba5ebf82f0cd6fa2788433d26e12b93669.zip
cpython-8fdc75ba5ebf82f0cd6fa2788433d26e12b93669.tar.gz
cpython-8fdc75ba5ebf82f0cd6fa2788433d26e12b93669.tar.bz2
Lock methods acquire() and locked() now return bools.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/threadmodule.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index 2459c3b..ba149dc 100644
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -68,17 +68,17 @@ lock_PyThread_acquire_lock(lockobject *self, PyObject *args)
return Py_None;
}
else
- return PyInt_FromLong((long)i);
+ return PyBool_FromLong((long)i);
}
static char acquire_doc[] =
-"acquire([wait]) -> None or Boolean\n\
+"acquire([wait]) -> None or bool\n\
(PyThread_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 when the lock is acquired.\n\
-With a Boolean argument, this will only block if the argument is true,\n\
+the lock, and return None 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 not interruptible.";
@@ -110,13 +110,13 @@ lock_locked_lock(lockobject *self)
{
if (PyThread_acquire_lock(self->lock_lock, 0)) {
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[] =
-"locked() -> Boolean\n\
+"locked() -> bool\n\
(locked_lock() is an obsolete synonym)\n\
\n\
Return whether the lock is in the locked state.";