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

being destroyed already.

Make close(), and hence del(), robust in the light of the world
being destroyed already.
83a6f2c5 · Guido van Rossum · 45c68f0d · 83a6f2c5
Commit 83a6f2c5 authored Dec 09, 1997 by Guido van Rossum
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

Lib/shelve.py Lib/shelve.py +6 -3

No files found.
--- 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()