From 031ae6e9049dc7db2208ed5a368d123c05975a8d Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Thu, 11 Feb 2010 01:56:42 +0000 Subject: [PATCH] Improve issue 7835 fix per MAL to handle the case that the module dictionary has also been cleared. --- Lib/shelve.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Lib/shelve.py b/Lib/shelve.py index 8055f42e22..c8cba8582d 100644 --- a/Lib/shelve.py +++ b/Lib/shelve.py @@ -145,11 +145,12 @@ class Shelf(UserDict.DictMixin): self.dict.close() except AttributeError: pass - # _ClosedDict can be None when close is called from __del__ during shutdown - if _ClosedDict is None: - self.dict = None - else: + # Catch errors that may happen when close is called from __del__ + # because CPython is in interpreter shutdown. + try: self.dict = _ClosedDict() + except (NameError, TypeError): + self.dict = None def __del__(self): if not hasattr(self, 'writeback'): -- 2.50.1