Improve issue 7835 fix per MAL to handle the case that the

module dictionary has also been cleared.

diff --git a/Lib/shelve.py b/Lib/shelve.py
index 8055f42e2291fb4ffa4fac27ab7feb566d0ce4a4..c8cba8582d6ff1ed7a4c7af6e42492fdfca3d13d 100644 (file)
--- 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'):