Issue #11444: Merge fix from 3.1.

This commit is contained in:
Vinay Sajip 2011-03-08 22:53:21 +00:00
commit d9512e9ac1

View file

@ -1793,6 +1793,7 @@ def shutdown(handlerList=_handlerList):
h = wr() h = wr()
if h: if h:
try: try:
h.acquire()
h.flush() h.flush()
h.close() h.close()
except (IOError, ValueError): except (IOError, ValueError):
@ -1801,6 +1802,8 @@ def shutdown(handlerList=_handlerList):
# references to them are still around at # references to them are still around at
# application exit. # application exit.
pass pass
finally:
h.release()
except: except:
if raiseExceptions: if raiseExceptions:
raise raise