summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-02-11 00:25:17 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-02-11 00:25:17 (GMT)
commit709b4c35cc6e6f5db58d9e440b5ca732b7fdb6a2 (patch)
tree4bfd2f68d5447789815e4b1d5d2b2f5657429f77 /Misc
parent54319287c9b3df17c0f6ce15b14619a9814ae292 (diff)
downloadcpython-709b4c35cc6e6f5db58d9e440b5ca732b7fdb6a2.zip
cpython-709b4c35cc6e6f5db58d9e440b5ca732b7fdb6a2.tar.gz
cpython-709b4c35cc6e6f5db58d9e440b5ca732b7fdb6a2.tar.bz2
Merged revisions 78139 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78139 | r.david.murray | 2010-02-10 19:15:05 -0500 (Wed, 10 Feb 2010) | 15 lines 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. ........ ................
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c5b971d..054bb3d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -79,6 +79,9 @@ Core and Builtins
Library
-------
+- Issue #7835: shelve should no longer produce mysterious warnings during
+ interpreter shutdown.
+
- Issue #6233: ElementTree failed converting unicode characters to XML
entities when they could't be represented in the requested output
encoding. Patch by Jerry Chen.