diff options
| -rw-r--r-- | Lib/shelve.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Lib/shelve.py b/Lib/shelve.py index fb2fa93..8271dfe 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'): @@ -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. |