diff options
author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2011-03-08 22:54:11 (GMT) |
---|---|---|
committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2011-03-08 22:54:11 (GMT) |
commit | df309939e5c0565ca75e6d86db8e73208d4e4771 (patch) | |
tree | 03b7f0fafdf834b699e34afe3d0aadf1a01eb300 /Lib/logging | |
parent | 7a2114719dd7403cacf1e133b2f7414eaab24188 (diff) | |
parent | d9512e9ac11cb6b22669d7c06a321dbeb56ec0f5 (diff) | |
download | cpython-df309939e5c0565ca75e6d86db8e73208d4e4771.zip cpython-df309939e5c0565ca75e6d86db8e73208d4e4771.tar.gz cpython-df309939e5c0565ca75e6d86db8e73208d4e4771.tar.bz2 |
Issue #11444: Merge fix from 3.2.
Diffstat (limited to 'Lib/logging')
-rw-r--r-- | Lib/logging/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index d9ac7d9..e4b34a1 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1793,6 +1793,7 @@ def shutdown(handlerList=_handlerList): h = wr() if h: try: + h.acquire() h.flush() h.close() except (IOError, ValueError): @@ -1801,6 +1802,8 @@ def shutdown(handlerList=_handlerList): # references to them are still around at # application exit. pass + finally: + h.release() except: if raiseExceptions: raise |