Make close(), and hence __del__(), robust in the light of the world

being destroyed already.

diff --git a/Lib/shelve.py b/Lib/shelve.py
index b159e61380794a82db2cdd60d6c8c26f577f278f..9b65a0911fa6bd376aca9a613af62008a78b9e5a 100644 (file)
--- a/Lib/shelve.py
+++ b/Lib/shelve.py
@@ -74,9 +74,12 @@ class Shelf:
                del self.dict[key]
        
        def close(self):
-               if hasattr(self.dict, 'close'):
-                       self.dict.close()
-               self.dict = None
+               try:
+                       if self.dict:
+                               self.dict.close()
+               except:
+                       pass
+               self.dict = 0
 
        def __del__(self):
                self.close()