From: R. David Murray Date: Thu, 11 Feb 2010 00:15:05 +0000 (+0000) Subject: Merged revisions 78137 via svnmerge from X-Git-Tag: v3.2a1~1707 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f449143f48969067d6bd7bfec6d377e993d46a5;p=thirdparty%2FPython%2Fcpython.git Merged revisions 78137 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78137 | r.david.murray | 2010-02-10 17:42:04 -0500 (Wed, 10 Feb 2010) | 8 lines Issue 7835: Shelve's __del__ method calls its close method, and its close method refers to an identifier in the global module namespace. This means that when __del__ is called during interpreter shutdown (if, for example, the calling program still has a pointer to the shelf), sometimes that global identifier would wind up being None, causing mysterious 'ignored' exceptions. This patch checks for the possible None value first before using the global, thus avoiding the error messages. ........ --- diff --git a/Lib/shelve.py b/Lib/shelve.py index fb2fa93b0100..8271dfeddca1 100644 --- a/Lib/shelve.py +++ b/Lib/shelve.py @@ -136,7 +136,11 @@ class Shelf(collections.MutableMapping): self.dict.close() except AttributeError: pass - self.dict = _ClosedDict() + # _ClosedDict can be None when close is called from __del__ during shutdown + if _ClosedDict is None: + self.dict = None + else: + self.dict = _ClosedDict() def __del__(self): if not hasattr(self, 'writeback'): diff --git a/Misc/NEWS b/Misc/NEWS index cb489dd4f26d..762def27c58e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -242,6 +242,9 @@ C-API Library ------- +- Issue #7835: shelve should no longer produce mysterious warnings during + interpreter shutdown. + - Issue #2746: Don't escape ampersands and angle brackets ("&", "<", ">") in XML processing instructions and comments. These raw characters are allowed by the XML specification, and are necessary when outputting e.g.