Bug #1339007: Shelf objects now don't raise an exception in their

__del__ method when initialization failed.
 (backport from rev. 46946)

diff --git a/Lib/shelve.py b/Lib/shelve.py
index 5e680bc3c68b6a0d624a91c8f1559773bf289c43..65e6cdbb6031b6b2ff73b5fff492d468cdbb4665 100644 (file)
--- a/Lib/shelve.py
+++ b/Lib/shelve.py
@@ -145,6 +145,9 @@ class Shelf(UserDict.DictMixin):
         self.dict = 0
 
     def __del__(self):
+        if not hasattr(self, 'writeback'):
+            # __init__ didn't succeed, so don't bother closing
+            return
         self.close()
 
     def sync(self):

diff --git a/Misc/NEWS b/Misc/NEWS
index 005255fdaa7c81bb1da8ee79ceff146c53d33f51..691d20981f87f59f530b98fbc9d019bec9565425 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -53,6 +53,9 @@ Extension Modules
 Library
 -------
 
+- Bug #1339007: Shelf objects now don't raise an exception in their
+  __del__ method when initialization failed.
+
 - Bug #1501223: Possible overflow in _PySys_Init() when reading the code page
   under Windows.