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

vsajip · vsajip · commit b9c85c156b0b · 2009-11-27T15:34:35.000Z
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
@@ -176,17 +176,17 @@ def addLevelName(level, levelName):
 #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():
     """
     Acquire the module-level lock for serializing access to shared data.
 
     This should be released with _releaseLock().
     """
-    global _lock
-    if (not _lock) and thread:
-        _lock = threading.RLock()
     if _lock:
         _lock.acquire()
 
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -18,6 +18,8 @@ Core and builtins
 Library
 -------
 
+- Issue #7403: logging: Fixed possible race condition in lock creation.
+
 - Issue #5068: Fixed the tarfile._BZ2Proxy.read() method that would loop
   forever on incomplete input. That caused tarfile.open() to hang when used
   with mode 'r' or 'r:bz2' and a fileobj argument that contained no data or
