clearing of the files in the situation when delete and not delete_on_…

…close is moved to _TemporaryFileWrapper based on the advice from @eryksun There are errors in the test (at least on Linux)
python · zooba · Oct 4, 2022 · Sep 21, 2022 · Sep 22, 2022 · Sep 22, 2022
commit 239354e2e4a09914cd9fac0847e9d883c84c0e08
diff --git a/Lib/tempfile.py b/Lib/tempfile.py
@@ -446,19 +446,16 @@ def close(self, unlink=_os.unlink):
                     if self.delete and self.delete_on_close:
                         unlink(self.name)
 
+        # Need to ensure the file is deleted on __del__
+        def __del__(self):
+            self.close()
 
     else:
         def close(self):
             if not self.close_called:
                 self.close_called = True
                 self.file.close()
 
-    def __del__(self):
-        self.close()
-        # Need to ensure the file is deleted on __del__ if delete = True and
-        # file still exists
-        if self.delete and _os.path.exists(self.name):
-            _os.unlink(self.name)
 
 class _TemporaryFileWrapper:
     """Temporary file wrapper
@@ -467,6 +464,8 @@ class _TemporaryFileWrapper:
     temporary use.  In particular, it seeks to automatically
     remove the file when it is no longer needed.
     """
+    name = None
+    _cleanup_called = False
 
     def __init__(self, file, name, delete=True, delete_on_close=True):
         self.file = file
@@ -501,22 +500,31 @@ def __enter__(self):
         self.file.__enter__()
         return self
 
+    def _cleanup(self):
+        if self._cleanup_called or self.name is None:
+            return
+        self._cleanup_called = True
+        try:
+            self.close()
+        finally:
+            # If the file is to be deleted, but not on close, delete it now.
+            if self.delete and not self.delete_on_close:
+                try:
+                    _os.unlink(self.name)
+                except FileNotFoundError:
+                    # The file may have been deleted already.
+                    pass
+
     # Need to trap __exit__ as well to ensure the file gets
     # deleted when used in a with statement
     def __exit__(self, exc, value, tb):
         result = self.file.__exit__(exc, value, tb)
-        self.close()
-        # If the file is to be deleted, but not on close, delete it now.
-        if self.delete and not self.delete_on_close:
-            try:
-                _os.unlink(self.name)
-            # It is okay to ignore FileNotFoundError. The file may have
-            # been deleted already.
-            except FileNotFoundError:
-                pass
-
+        self._cleanup()
         return result
 
+    def __del__(self):
+        self._cleanup()
+
     def close(self):
         """
         Close the temporary file, possibly deleting it.
@@ -533,6 +541,17 @@ def __iter__(self):
         for line in self.file:
             yield line
 
+    def __del__(self):
+        # This is to delete the temporary file in case delete = True,
+        # delete_on_close = False and no context manager was used
+        if self.delete:
+            try:
+                _os.unlink(self.name)
+            # It is okay to ignore FileNotFoundError. The file may have
+            # been deleted already.
+            except FileNotFoundError:
+                pass
+
 
 def NamedTemporaryFile(mode='w+b', buffering=-1, encoding=None,
                        newline=None, suffix=None, prefix=None,