[Python-checkins] (merge 3.1 -> 3.2): Issue #11444: Merge fix from 3.1.

Tue Mar 8 23:54:41 CET 2011

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

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -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
-- 
Repository URL: http://hg.python.org/cpython
