commit 805ddaa3daeba06294973df7603e0d2f2014c4ff
author Vinay Sajip <vinay_sajip@yahoo.co.uk> Mon Sep 27 21:51:36 2010 +0000
committer Vinay Sajip <vinay_sajip@yahoo.co.uk> Mon Sep 27 21:51:36 2010 +0000
tree e76f161048cea19763e136b53a1b2a9c552da301
parent 3ab905f17bebb69bba4df2a4baa0af3e973eb2b2

Issue #9947: logging: backported locking fix from py3k.

Lib/logging/config.py

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 07574d3..2ca7845 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -19,7 +19,7 @@
 is based on PEP 282 and comments thereto in comp.lang.python, and influenced
 by Apache's log4j system.
 
-Copyright (C) 2001-2008 Vinay Sajip. All Rights Reserved.
+Copyright (C) 2001-2010 Vinay Sajip. All Rights Reserved.
 
 To use, simply 'import logging' and log away!
 """
@@ -370,8 +370,10 @@
     Stop the listening server which was created with a call to listen().
     """
     global _listener
-    if _listener:
-        logging._acquireLock()
-        _listener.abort = 1
-        _listener = None
+    logging._acquireLock()
+    try:
+        if _listener:
+            _listener.abort = 1
+            _listener = None
+    finally:
         logging._releaseLock()