From 412d5fab78c3de8c51d3904dfa8811b4f42c82cb Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 8 Jul 2005 22:25:17 +0000 Subject: [PATCH] backport bug [ 1234979 ] Lock.acquire treats only 1 as True --- Misc/NEWS | 3 +++ Python/thread_nt.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index fb0391f4cb2a..274d84268905 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -29,6 +29,9 @@ Core and builtins Extension Modules ----------------- +- Bug #1234979: For the argument of thread.Lock.acquire, the Windows + implemented treated all integer values except 1 as false. + - Bug #1194181: bz2.BZ2File didn't handle mode 'U' correctly. - Bug #1166660: The readline module could segfault if hook functions diff --git a/Python/thread_nt.h b/Python/thread_nt.h index 7d2290e6b88a..47c776f08088 100644 --- a/Python/thread_nt.h +++ b/Python/thread_nt.h @@ -299,7 +299,7 @@ int PyThread_acquire_lock(PyThread_type_lock aLock, int waitflag) dprintf(("%ld: PyThread_acquire_lock(%p, %d) called\n", PyThread_get_thread_ident(),aLock, waitflag)); - success = aLock && EnterNonRecursiveMutex((PNRMUTEX) aLock, (waitflag == 1 ? INFINITE : 0)) == WAIT_OBJECT_0 ; + success = aLock && EnterNonRecursiveMutex((PNRMUTEX) aLock, (waitflag ? INFINITE : 0)) == WAIT_OBJECT_0 ; dprintf(("%ld: PyThread_acquire_lock(%p, %d) -> %d\n", PyThread_get_thread_ident(),aLock, waitflag, success)); -- 2.47.3