From: R. David Murray <rdmurray@bitdance.com>
Date: Thu, 11 Feb 2010 01:56:42 +0000 (+0000)
Subject: Improve issue 7835 fix per MAL to handle the case that the
X-Git-Tag: v2.7a4~199
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=031ae6e9049dc7db2208ed5a368d123c05975a8d;p=python

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 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'):