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

__del__ method when initialization failed.

Bug #1339007: Shelf objects now don't raise an exception in their
__del__ method when initialization failed.
4e24dc55 · Georg Brandl · 1d369fe7 · 4e24dc55 · 4e24dc55
Commit 4e24dc55 authored Jun 14, 2006 by Georg Brandl
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

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

Misc/NEWS Misc/NEWS +3 -0

No files found.
--- a/Lib/shelve.py
+++ b/Lib/shelve.py
@@ -139,6 +139,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):

--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -156,6 +156,9 @@ Extension Modules
 Library
 -------

+- Bug #1339007: Shelf objects now don't raise an exception in their
+  __del__ method when initialization failed.
+
 - Patch #1455898: The MBCS codec now supports the incremental mode for
  double-byte encodings.