Issue #7403: Fixed possible race condition in lock creation.

This commit is contained in:
Vinay Sajip 2009-11-27 14:03:36 +00:00
parent 50ea4565bd
commit 01801d1f08
2 changed files with 6 additions and 4 deletions

View File

@ -202,7 +202,10 @@ def _checkLevel(level):
#the lock would already have been acquired - so we need an RLock.
#The same argument applies to Loggers and Manager.loggerDict.
#
_lock = None
if thread:
_lock = threading.RLock()
else:
_lock = None
def _acquireLock():
"""
@ -210,9 +213,6 @@ def _acquireLock():
This should be released with _releaseLock().
"""
global _lock
if (not _lock) and thread:
_lock = threading.RLock()
if _lock:
_lock.acquire()

View File

@ -483,6 +483,8 @@ Core and Builtins
Library
-------
- Issue #7403: logging: Fixed possible race condition in lock creation.
- Issue #6845: Add restart support for binary upload in ftplib. The
`storbinary()` method of FTP and FTP_TLS objects gains an optional `rest`
argument. Patch by Pablo Mouzo.