Issue #9501: Improved shutdown handling to deal with module attributes correctly.

This commit is contained in:
Vinay Sajip 2013-01-15 17:55:13 +00:00
parent e39ba04e22
commit 51b55517a1
1 changed files with 2 additions and 1 deletions

View File

@ -624,7 +624,8 @@ def _removeHandlerRef(wr):
# 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:
if (_acquireLock is not None and _handlerList is not None and
_releaseLock is not None):
_acquireLock()
try:
if wr in _handlerList: