diff options
| -rw-r--r-- | Lib/logging/__init__.py | 28 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 22 insertions, 8 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 80ec672..5922ed3 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -617,12 +617,16 @@ def _removeHandlerRef(wr): """ Remove a handler reference from the internal cleanup list. """ - _acquireLock() - try: - if wr in _handlerList: - _handlerList.remove(wr) - finally: - _releaseLock() + # This function can be called during module teardown, when globals are + # set to None. If _acquireLock is None, assume this is the case and do + # nothing. + if _acquireLock is not None: + _acquireLock() + try: + if wr in _handlerList: + _handlerList.remove(wr) + finally: + _releaseLock() def _addHandlerRef(handler): """ @@ -1612,8 +1616,16 @@ def shutdown(handlerList=_handlerList): #we just ignore them if raiseExceptions is not set try: h = wr() - h.flush() - h.close() + if h: + try: + h.flush() + h.close() + except (IOError, ValueError): + # Ignore errors which might be caused + # because handlers have been closed but + # references to them are still around at + # application exit. + pass except: if raiseExceptions: raise @@ -31,6 +31,8 @@ Core and Builtins Library ------- +- Issue #9501: Fixed logging regressions in cleanup code. + - Issue #9214: Set operations on KeysView or ItemsView in the collections module now correctly return a set. (Patch by Eli Bendersky.) |