| commit | 6599fb0917704247f72b3338e622ebcbb94ba207 | [log] [tgz] |
|---|---|---|
| author | Guido van Rossum <guido@python.org> | Tue Dec 09 14:18:33 1997 +0000 |
| committer | Guido van Rossum <guido@python.org> | Tue Dec 09 14:18:33 1997 +0000 |
| tree | 4b547af712c7903c666a17f19e112342bdc93572 | |
| parent | 19b55f2d17d2a189f9b48844c06d501f25ca6dc5 [diff] [blame] |
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 b159e61..9b65a09 100644 --- a/Lib/shelve.py +++ b/Lib/shelve.py
@@ -74,9 +74,12 @@ 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()