Kaydet (Commit) 03f6c11f authored tarafından Vinay Sajip's avatar Vinay Sajip

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

üst 608eb2d4
...@@ -199,7 +199,11 @@ def _checkLevel(level): ...@@ -199,7 +199,11 @@ def _checkLevel(level):
#the lock would already have been acquired - so we need an RLock. #the lock would already have been acquired - so we need an RLock.
#The same argument applies to Loggers and Manager.loggerDict. #The same argument applies to Loggers and Manager.loggerDict.
# #
_lock = None if thread:
_lock = threading.RLock()
else:
_lock = None
def _acquireLock(): def _acquireLock():
""" """
...@@ -207,9 +211,6 @@ def _acquireLock(): ...@@ -207,9 +211,6 @@ def _acquireLock():
This should be released with _releaseLock(). This should be released with _releaseLock().
""" """
global _lock
if (not _lock) and thread:
_lock = threading.RLock()
if _lock: if _lock:
_lock.acquire() _lock.acquire()
......
...@@ -140,6 +140,8 @@ C-API ...@@ -140,6 +140,8 @@ C-API
Library Library
------- -------
- Issue #7403: logging: Fixed possible race condition in lock creation.
- Issue #6845: Add restart support for binary upload in ftplib. The - Issue #6845: Add restart support for binary upload in ftplib. The
`storbinary()` method of FTP and FTP_TLS objects gains an optional `rest` `storbinary()` method of FTP and FTP_TLS objects gains an optional `rest`
argument. Patch by Pablo Mouzo. argument. Patch by Pablo Mouzo.
......
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