changeset:   68336:39469645857a
branch:      3.2
parent:      68329:bbf8a8a1af17
parent:      68335:16f8f359db9c
user:        Vinay Sajip <vinay_sajip@yahoo.co.uk>
date:        Tue Mar 08 22:53:21 2011 +0000
files:       Lib/logging/__init__.py
description:
Issue #11444: Merge fix from 3.1.


diff -r bbf8a8a1af17 -r 39469645857a Lib/logging/__init__.py
--- a/Lib/logging/__init__.py	Tue Mar 08 16:17:35 2011 +0200
+++ b/Lib/logging/__init__.py	Tue Mar 08 22:53:21 2011 +0000
@@ -1793,6 +1793,7 @@
             h = wr()
             if h:
                 try:
+                    h.acquire()
                     h.flush()
                     h.close()
                 except (IOError, ValueError):
@@ -1801,6 +1802,8 @@
                     # references to them are still around at
                     # application exit.
                     pass
+                finally:
+                    h.release()
         except:
             if raiseExceptions:
                 raise