Ignore errors when deleting files and folders on Windows

Author: pkch

misc/incremental_checker.py

@@ -39,12 +39,13 @@
 import json
 import os
 import random
-import shutil
 import subprocess
 import sys
 import textwrap
 import time
 
+from mypy.util import delete_folder
+
 
 CACHE_PATH = ".incremental_checker_cache.json"
 MYPY_REPO_URL = "https://github.com/python/mypy.git"
@@ -59,11 +60,6 @@ def print_offset(text: str, indent_length: int = 4) -> None:
     print()
 
 
-def delete_folder(folder_path: str) -> None:
-    if os.path.exists(folder_path):
-        shutil.rmtree(folder_path)
-
-
 def execute(command: List[str], fail_on_error: bool = True) -> Tuple[str, str, int]:
     proc = subprocess.Popen(
         ' '.join(command),

misc/perf_checker.py

@@ -9,6 +9,8 @@
 import textwrap
 import time
 
+from mypy.util import delete_folder
+
 
 class Command:
     def __init__(self, setup: Callable[[], None], command: Callable[[], None]) -> None:
@@ -22,11 +24,6 @@ def print_offset(text: str, indent_length: int = 4) -> None:
     print()
 
 
-def delete_folder(folder_path: str) -> None:
-    if os.path.exists(folder_path):
-        shutil.rmtree(folder_path)
-
-
 def execute(command: List[str]) -> None:
     proc = subprocess.Popen(
         ' '.join(command),

misc/touch_checker.py

@@ -11,18 +11,15 @@
 import textwrap
 import time
 
+from mypy.util import delete_folder
+
 
 def print_offset(text: str, indent_length: int = 4) -> None:
     print()
     print(textwrap.indent(text, ' ' * indent_length))
     print()
 
 
-def delete_folder(folder_path: str) -> None:
-    if os.path.exists(folder_path):
-        shutil.rmtree(folder_path)
-
-
 def execute(command: List[str]) -> None:
     proc = subprocess.Popen(
         ' '.join(command),
@@ -121,7 +118,7 @@ def main() -> None:
     deltas = []
     for filename in glob.iglob("mypy/**/*.py", recursive=True):
         print("{} {}".format(verb, filename))
-        
+
         setup, teardown = make_wrappers(filename)
         delta = test(
             setup,

mypy/myunit/__init__.py

@@ -131,7 +131,10 @@ def tear_down(self) -> None:
         if self.suite:
             self.suite.tear_down()
         os.chdir(self.old_cwd)
-        self.tmpdir.cleanup()
+        try:
+            self.tmpdir.cleanup()
+        except OSError:
+            pass
         self.old_cwd = None
         self.tmpdir = None
 

mypy/test/data.py

@@ -5,12 +5,12 @@
 import posixpath
 import re
 from os import remove, rmdir
-import shutil
 
 import pytest  # type: ignore  # no pytest in typeshed
 from typing import Callable, List, Tuple, Set, Optional, Iterator, Any
 
 from mypy.myunit import TestCase, SkipTestCaseException
+from mypy.util import delete_folder, delete_file
 
 
 def parse_test_cases(
@@ -228,13 +228,13 @@ def tear_down(self) -> None:
         # First remove files.
         for is_dir, path in reversed(self.clean_up):
             if not is_dir:
-                remove(path)
+                delete_file(path)
         # Then remove directories.
         for is_dir, path in reversed(self.clean_up):
             if is_dir:
                 pycache = os.path.join(path, '__pycache__')
                 if os.path.isdir(pycache):
-                    shutil.rmtree(pycache)
+                    delete_folder(pycache)
                 try:
                     rmdir(path)
                 except OSError as error:
@@ -251,7 +251,7 @@ def tear_down(self) -> None:
                     # Be defensive -- only call rmtree if we're sure we aren't removing anything
                     # valuable.
                     if path.startswith('tmp/') and os.path.isdir(path):
-                        shutil.rmtree(path)
+                        delete_folder(path)
                     raise
         super().tear_down()
 

mypy/test/testcheck.py

@@ -21,6 +21,7 @@
 )
 from mypy.errors import CompileError
 from mypy.options import Options
+from mypy.util import delete_folder
 
 from mypy import experiments
 
@@ -113,10 +114,7 @@ def run_case(self, testcase: DataDrivenTestCase) -> None:
                 experiments.STRICT_OPTIONAL = old_strict_optional
 
     def clear_cache(self) -> None:
-        dn = defaults.CACHE_DIR
-
-        if os.path.exists(dn):
-            shutil.rmtree(dn)
+        delete_folder(defaults.CACHE_DIR)
 
     def run_case_once(self, testcase: DataDrivenTestCase, incremental: int = 0) -> None:
         find_module_clear_caches()

mypy/test/testcmdline.py

@@ -17,6 +17,7 @@
 from mypy.test.data import parse_test_cases, DataDrivenTestCase
 from mypy.test.helpers import assert_string_arrays_equal
 from mypy.version import __version__, base_version
+from mypy.util import delete_file
 
 # Path to Python 3 interpreter
 python3_path = sys.executable
@@ -58,7 +59,7 @@ def test_python_evaluation(testcase: DataDrivenTestCase) -> None:
     # Split output into lines.
     out = [s.rstrip('\n\r') for s in str(outb, 'utf8').splitlines()]
     # Remove temp file.
-    os.remove(program_path)
+    delete_file(program_path)
     # Compare actual output to expected.
     if testcase.output_files:
         for path, expected_content in testcase.output_files:

mypy/test/testpythoneval.py

@@ -25,7 +25,7 @@
 from mypy.test.config import test_data_prefix, test_temp_dir
 from mypy.test.data import DataDrivenTestCase, parse_test_cases
 from mypy.test.helpers import assert_string_arrays_equal
-from mypy.util import try_find_python2_interpreter
+from mypy.util import try_find_python2_interpreter, delete_file
 
 
 # Files which contain test case descriptions.
@@ -94,7 +94,7 @@ def test_python_evaluation(testcase: DataDrivenTestCase) -> None:
         returncode, interp_out = run([interpreter, program], env=env)
         out += interp_out
     # Remove temp file.
-    os.remove(program_path)
+    delete_file(program_path)
     assert_string_arrays_equal(adapt_output(testcase), out,
                                'Invalid output ({}, line {})'.format(
                                    testcase.file, testcase.line))

mypy/test/teststubgen.py

@@ -22,6 +22,7 @@
     parse_signature, parse_all_signatures, build_signature, find_unique_signatures,
     infer_sig_from_docstring
 )
+from mypy.util import delete_folder, delete_file
 
 
 class StubgenUtilSuite(Suite):
@@ -136,8 +137,8 @@ def test_stubgen(testcase: DataDrivenTestCase) -> None:
                                        testcase.file, testcase.line))
     finally:
         handle.close()
-        os.unlink(handle.name)
-        shutil.rmtree(out_dir)
+        delete_file(handle.name)
+        delete_folder(out_dir)
 
 
 def reset_importlib_caches() -> None:

mypy/util.py

@@ -2,6 +2,9 @@
 
 import re
 import subprocess
+import os
+import sys
+import shutil
 from xml.sax.saxutils import escape
 from typing import TypeVar, List, Tuple, Optional, Sequence, Dict
 
@@ -134,3 +137,21 @@ def id(self, o: object) -> int:
             self.id_map[o] = self.next_id
             self.next_id += 1
         return self.id_map[o]
+
+
+def delete_folder(folder_path: str) -> None:
+    if sys.platform.startswith('win'):
+        shutil.rmtree(folder_path, ignore_errors=True)
+    else:
+        if os.path.exists(folder_path):
+            shutil.rmtree(folder_path)
+
+
+def delete_file(file_path: str) -> None:
+    if sys.platform.startswith('win'):
+        try:
+            os.remove(file_path)
+        except OSError:
+            pass
+    else:
+        os.remove(file_path)