remove delete_removed_files ?

Author: DanielYang59

src/monty/tempfile.py

@@ -51,7 +51,7 @@ def __init__(
         copy_from_current_on_enter: bool = False,
         copy_to_current_on_exit: bool = False,
         gzip_on_exit: bool = False,
-        delete_removed_files: bool = False,
+        delete_removed_files: bool | None = None,
     ) -> None:
         """
         Initializes scratch directory given a **root** path. There is no need
@@ -83,10 +83,15 @@ def __init__(
             gzip_on_exit (bool): Whether to gzip the files generated in the
                 ScratchDir before copying them back.
                 Defaults to False.
-            delete_removed_files (bool): Whether to delete files in the cwd
-                that are not present in the tmp dir. WARNING: this could
-                wipe your CWD. Defaults to False..
+            delete_removed_files (bool): Deprecated, don't use.
         """
+        if delete_removed_files is not None:
+            warnings.warn(
+                "delete_removed_files is deprecated and would have no effect",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+
         self.cwd: str = os.getcwd()
         self.rootpath: str | None = (
             None if rootpath is None else os.path.abspath(rootpath)
@@ -105,7 +110,6 @@ def __init__(
         self.enter_copy: bool = copy_from_current_on_enter
         self.exit_copy: bool = copy_to_current_on_exit
         self.gzip_on_exit: bool = gzip_on_exit
-        self.delete_removed_files: bool = delete_removed_files
 
     def __enter__(self) -> str:
         tempdir: str = self.cwd
@@ -122,9 +126,6 @@ def __enter__(self) -> str:
     def __exit__(self, exc_type, exc_val, exc_tb) -> None:
         if not self.pass_through:
             if self.exit_copy:
-                files = set(os.listdir(self.tempdir))
-                orig_files = set(os.listdir(self.cwd))
-
                 # gzip files
                 if self.gzip_on_exit:
                     gzip_dir(self.tempdir)
@@ -175,12 +176,6 @@ def get_modif_times(
                 # copy files over
                 shutil.copytree(self.tempdir, self.cwd, dirs_exist_ok=True)
 
-                # Delete any files that are now gone
-                if self.delete_removed_files:
-                    for f in orig_files - files:
-                        fpath = os.path.join(self.cwd, f)
-                        remove(fpath)
-
             os.chdir(self.cwd)
             remove(self.tempdir)
             if self.create_symbolic_link and os.path.islink(ScratchDir.SCR_LINK):

tests/test_tempfile.py

@@ -54,12 +54,10 @@ def test_with_copy(self):
         assert not os.path.exists(d)
         files = os.listdir(".")
         assert "scratch_text" in files
-
-        # We check that the pre-scratch file no longer exists (because it is
-        # deleted in the scratch)
-        assert "pre_scratch_text" not in files
         os.remove("scratch_text")
 
+        os.remove("pre_scratch_text")
+
     def test_with_copy_gzip(self):
         # We write a pre-scratch file.
         with open("pre_scratch_text", "w", encoding="utf-8") as f:
@@ -84,37 +82,7 @@ def test_with_copy_gzip(self):
             if f.endswith(".gz") and f not in init_gz_files:
                 os.remove(f)
         os.remove("pre_scratch_text")
-
-    def test_with_copy_nodelete(self):
-        # We write a pre-scratch file.
-        with open("pre_scratch_text", "w", encoding="utf-8") as f:
-            f.write("write")
-
-        with ScratchDir(
-            self.scratch_root,
-            copy_from_current_on_enter=True,
-            copy_to_current_on_exit=True,
-            delete_removed_files=False,
-        ) as d:
-            with open("scratch_text", "w", encoding="utf-8") as f:
-                f.write("write")
-            files = os.listdir(d)
-            assert "scratch_text" in files
-            assert "empty_file.txt" in files
-            assert "pre_scratch_text" in files
-
-            # We remove the pre-scratch file.
-            os.remove("pre_scratch_text")
-
-        # Make sure the tempdir is deleted.
-        assert not os.path.exists(d)
-        files = os.listdir(".")
-        assert "scratch_text" in files
-
-        # We check that the pre-scratch file DOES still exists
-        assert "pre_scratch_text" in files
         os.remove("scratch_text")
-        os.remove("pre_scratch_text")
 
     def test_no_copy(self):
         with ScratchDir(