diff options
| -rw-r--r-- | Lib/mailbox.py | 14 | ||||
| -rw-r--r-- | Lib/test/test_mailbox.py | 13 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 25 insertions, 5 deletions
diff --git a/Lib/mailbox.py b/Lib/mailbox.py index b96b270..e23ea8c 100644 --- a/Lib/mailbox.py +++ b/Lib/mailbox.py @@ -1923,9 +1923,10 @@ class _ProxyFile: def close(self): """Close the file.""" - if hasattr(self._file, 'close'): - self._file.close() - del self._file + if hasattr(self, '_file'): + if hasattr(self._file, 'close'): + self._file.close() + del self._file def _read(self, size, read_method): """Read size bytes using read_method.""" @@ -1957,6 +1958,10 @@ class _ProxyFile: @property def closed(self): + if not hasattr(self, '_file'): + return True + if not hasattr(self._file, 'closed'): + return False return self._file.closed @@ -1995,7 +2000,8 @@ class _PartialFile(_ProxyFile): def close(self): # do *not* close the underlying file object for partial files, # since it's global to the mailbox object - del self._file + if hasattr(self, '_file'): + del self._file def _lock_file(f, dotlock=True): diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py index 10317c3..fb4812d 100644 --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -297,6 +297,13 @@ class TestMailbox(TestBase): self.assertEqual(data1.decode('ascii').replace(os.linesep, '\n'), _sample_message) + def test_get_file_can_be_closed_twice(self): + # Issue 11700 + key = self._box.add(_sample_message) + f = self._box.get_file(key) + f.close() + f.close() + def test_iterkeys(self): # Get keys using iterkeys() self._check_iteration(self._box.keys, do_keys=True, do_values=False) @@ -1862,8 +1869,12 @@ class TestProxyFileBase(TestBase): def _test_close(self, proxy): # Close a file + self.assertFalse(proxy.closed) + proxy.close() + self.assertTrue(proxy.closed) + # Issue 11700 subsequent closes should be a no-op. proxy.close() - self.assertRaises(AttributeError, lambda: proxy.close()) + self.assertTrue(proxy.closed) class TestProxyFile(TestProxyFileBase): @@ -25,6 +25,9 @@ Core and Builtins Library ------- +- Issue #11700: mailbox proxy object close methods can now be called multiple + times without error. + - Issue #11767: Correct file descriptor leak in mailbox's __getitem__ method. - Issue #12133: AbstractHTTPHandler.do_open() of urllib.request closes the HTTP |