[Python-checkins] (merge 2.6 -> 2.7): Issue #11444: Merge fix from 2.6.
vinay.sajip
python-checkins at python.org
Tue Mar 8 23:54:33 CET 2011
http://hg.python.org/cpython/rev/c8b651b3a493
changeset: 68334:c8b651b3a493
branch: 2.7
parent: 68331:88b5a93b1725
parent: 68333:fc4d045e3170
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Tue Mar 08 22:47:18 2011 +0000
summary:
Issue #11444: Merge fix from 2.6.
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
@@ -1627,6 +1627,7 @@
h = wr()
if h:
try:
+ h.acquire()
h.flush()
h.close()
except (IOError, ValueError):
@@ -1635,6 +1636,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
More information about the Python-checkins
mailing list