[Python-checkins] r78138 - in python/branches/release26-maint: Lib/shelve.py Misc/NEWS

[r.david.murray]

Author: r.david.murray
Date: Wed Feb 10 23:47:57 2010
New Revision: 78138

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/shelve.py
   python/branches/release26-maint/Misc/NEWS

Modified: python/branches/release26-maint/Lib/shelve.py
==============================================================================
--- python/branches/release26-maint/Lib/shelve.py	(original)
+++ python/branches/release26-maint/Lib/shelve.py	Wed Feb 10 23:47:57 2010
@@ -145,7 +145,11 @@
             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'):

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Wed Feb 10 23:47:57 2010
@@ -66,6 +66,9 @@
 Library
 -------
 
+- Issue #7835: shelve should no longer produce mysterious warnings during
+  interpreter shutdown.
+
 - Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is
   specified, rather than fall through to AF_PACKET (in the `socket` module).
   Also, raise ValueError rather than TypeError when an unknown TIPC address