[Python-checkins] cpython (merge 3.3 -> default): Issue #9501: Merged fix from 3.3.

[vinay.sajip]

http://hg.python.org/cpython/rev/4fd8c35a05b2
changeset:   81534:4fd8c35a05b2
parent:      81529:340e97ebe911
parent:      81533:3161a94ff73c
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Tue Jan 15 17:57:18 2013 +0000
summary:
  Issue #9501: Merged fix from 3.3.

files:
  Lib/logging/__init__.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -708,7 +708,8 @@
     # This function can be called during module teardown, when globals are
     # set to None. If _acquireLock is None, assume this is the case and do
     # nothing.
-    if _acquireLock is not None:
+    if (_acquireLock is not None and _handlerList is not None and
+        _releaseLock is not None):
         _acquireLock()
         try:
             if wr in _handlerList:

-- 
Repository URL: http://hg.python.org/cpython