diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2011-03-08 22:53:21 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2011-03-08 22:53:21 (GMT) |
| commit | d9512e9ac11cb6b22669d7c06a321dbeb56ec0f5 (patch) | |
| tree | a0dc4e92cdbc9c746e318709caedbdcc9624243c /Lib/logging | |
| parent | 3d995843ce0e5f0c1f5875a6092369bfe83cbec0 (diff) | |
| parent | c8ab6eeb01ef01d8a630cbf177b06cece326be54 (diff) | |
| download | cpython-d9512e9ac11cb6b22669d7c06a321dbeb56ec0f5.zip cpython-d9512e9ac11cb6b22669d7c06a321dbeb56ec0f5.tar.gz cpython-d9512e9ac11cb6b22669d7c06a321dbeb56ec0f5.tar.bz2 | |
Issue #11444: Merge fix from 3.1.
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 |