From 7e7a3dba5fd4262269f713dfe21ba7e4746fc2dd Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 10 Apr 2015 13:24:41 +0300
Subject: 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.

---
 Lib/tempfile.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Lib/tempfile.py')

diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index 5eafc1fe7a..a2764d3e31 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):
-- 
cgit v1.2.1