remove, not hide, extensions

Author: nedbat

Makefile

@@ -16,8 +16,8 @@ help:					## Show this help.
 	@awk -F ':.*##' '/^[^: ]+:.*##/{printf "  \033[1m%-20s\033[m %s\n",$$1,$$2} /^##@/{printf "\n%s\n",substr($$0,5)}' $(MAKEFILE_LIST)
 
 _clean_platform:
-	@rm -f *.so */*.so */*.so.hidden
-	@rm -f *.pyd */*.pyd */*.pyd.hidden
+	@rm -f *.so */*.so
+	@rm -f *.pyd */*.pyd
 	@rm -rf __pycache__ */__pycache__ */*/__pycache__ */*/*/__pycache__ */*/*/*/__pycache__ */*/*/*/*/__pycache__
 	@rm -f *.pyc */*.pyc */*/*.pyc */*/*/*.pyc */*/*/*/*.pyc */*/*/*/*/*.pyc
 	@rm -f *.pyo */*.pyo */*/*.pyo */*/*/*.pyo */*/*/*/*.pyo */*/*/*/*/*.pyo

igor.py

@@ -52,8 +52,8 @@ def do_show_env():
         print(f"  {env} = {os.environ[env]!r}")
 
 
-def hide_extension(core, *args):
-    """Hide the compiled C extension, no matter what its name."""
+def remove_extension(core, *args):
+    """Remove the compiled C extension, no matter what its name."""
 
     if core == "ctrace":
         return
@@ -97,11 +97,7 @@ def hide_extension(core, *args):
                 if VERBOSITY > 1:
                     print(f"Removing {os.path.abspath(filename)}")
                 try:
-                    hidden_name = filename + ".hidden"
-                    if os.path.exists(hidden_name):
-                        os.remove(hidden_name)
-                    os.rename(filename, hidden_name)
-                    return hidden_name
+                    os.remove(filename)
                 except OSError as exc:
                     if VERBOSITY > 1:
                         print(f"Couldn't remove {os.path.abspath(filename)}: {exc}")
@@ -164,16 +160,11 @@ def make_env_id(core):
 
 def run_tests(core, *runner_args):
     """The actual running of tests."""
-    hidden = hide_extension(core)
+    remove_extension(core)
     if "COVERAGE_TESTING" not in os.environ:
         os.environ["COVERAGE_TESTING"] = "True"
     print_banner(label_for_core(core))
-
-    try:
-        return pytest.main(list(runner_args))
-    finally:
-        if hidden:
-            os.remove(hidden)
+    return pytest.main(list(runner_args))
 
 
 def run_tests_with_coverage(core, *runner_args):
@@ -222,7 +213,7 @@ def run_tests_with_coverage(core, *runner_args):
                 if getattr(mod, "__file__", "??").startswith(covdir):
                     covmods[name] = mod
                     del sys.modules[name]
-        hidden = hide_extension(core)
+        remove_extension(core)
 
         # Remove the reference to metacov.ini.
         del os.environ["COVERAGE_PROCESS_START"]
@@ -237,8 +228,6 @@ def run_tests_with_coverage(core, *runner_args):
     finally:
         cov.stop()
         os.remove(pth_path)
-        if hidden:
-            os.remove(hidden)
 
     cov.save()
     return status