diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-10 10:29:28 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-10 10:29:28 (GMT) |
commit | 2116b12da59f77358cc539b90f58a3cdea43c2fd (patch) | |
tree | 693d26652b1dbf8b2ac058c5725f9726c3d14a0b /Lib/tempfile.py | |
parent | fcbf8f3e3d46eb023dd9a3954c6f9ed9a533d427 (diff) | |
parent | 7e7a3dba5fd4262269f713dfe21ba7e4746fc2dd (diff) | |
download | cpython-2116b12da59f77358cc539b90f58a3cdea43c2fd.zip cpython-2116b12da59f77358cc539b90f58a3cdea43c2fd.tar.gz cpython-2116b12da59f77358cc539b90f58a3cdea43c2fd.tar.bz2 |
Issue #23865: close() methods in multiple modules now are idempotent and more
robust at shutdown. If needs to release multiple resources, they are released
even if errors are occured.
Diffstat (limited to 'Lib/tempfile.py')
-rw-r--r-- | Lib/tempfile.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Lib/tempfile.py b/Lib/tempfile.py index 4543d3f..81c289a 100644 --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -357,9 +357,11 @@ class _TemporaryFileCloser: def close(self, unlink=_os.unlink): if not self.close_called and self.file is not None: self.close_called = True - self.file.close() - if self.delete: - unlink(self.name) + try: + self.file.close() + finally: + if self.delete: + unlink(self.name) # Need to ensure the file is deleted on __del__ def __del__(self): |