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

being destroyed already.
1997-12-09 14:18:33 +00:00 · 1997-12-09 14:18:33 +00:00 · 6599fb0917
parent 19b55f2d17
commit 6599fb0917
1 changed files with 6 additions and 3 deletions
--- 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()