From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Mon, 27 Sep 2010 21:51:36 +0000 (+0000)
Subject: Issue #9947: logging: backported locking fix from py3k.
X-Git-Tag: v3.1.3rc1~196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=805ddaa3daeba06294973df7603e0d2f2014c4ff;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 07574d310a8c..2ca784510fc9 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -19,7 +19,7 @@ Configuration functions for the logging package for Python. The core package
 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 @@ def stopListening():
     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()