undo some debugging

Author: nedbat

.github/workflows/testsuite.yml

@@ -81,16 +81,16 @@ jobs:
           # https://github.com/actions/python-versions/blob/main/versions-manifest.json
           # https://github.com/actions/setup-python/blob/main/docs/advanced-usage.md#available-versions-of-python-and-pypy
           - "3.9"
-          #- "3.10"
-          #- "3.11"
-          #- "3.12"
-          #- "3.13"
-          #- "3.13t"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
+          - "3.13t"
           - "3.14"
-          #- "3.14t"
-          #- "pypy-3.9"
-          #- "pypy-3.10"
-          #- "pypy-3.11"
+          - "3.14t"
+          - "pypy-3.9"
+          - "pypy-3.10"
+          - "pypy-3.11"
         #
         # If we need to exclude any combinations, do it like this:
         #  exclude:
@@ -130,8 +130,9 @@ jobs:
           python -VV
           python -m site
           # For extreme debugging:
-          python -c "import urllib.request as r; exec(r.urlopen('https://bit.ly/pydoctor').read())"
+          # python -c "import urllib.request as r; exec(r.urlopen('https://bit.ly/pydoctor').read())"
           env | sort
+          # Ideally, the system Python wouldn't have writable sitepackages.
           chmod u-w $(python -c "import site; print(site.getsitepackages()[0])")
           ls -ld $(python -c "import site; print(site.getsitepackages()[0])")
           whoami

coverage/files.py

@@ -221,18 +221,7 @@ def prep_patterns(patterns: Iterable[str]) -> list[str]:
 def create_pth_file() -> Path | None:
     """Create .pth file for measuring subprocesses."""
     for pth_dir in site.getsitepackages():  # pragma: part covered
-        pth_file = Path(pth_dir) / "zzz_subcover.pth"
-        import contextlib # DELETE ME
-        with open("/tmp/foo.out", "a", encoding="utf-8") as f:
-            with contextlib.redirect_stdout(f):
-                import inspect;print("\n".join("%30s : %s:%d" % (t[3], t[1], t[2]) for t in inspect.stack()[99:0:-1]))
-                print(f"{sys.executable = }")
-                print(f"{sys.argv = }")
-                print(f"sys.path:\n  {'\n  '.join(sys.path)}")
-                print(f"{sys.prefix = }; {sys.exec_prefix = }")
-                print(f"{site.getsitepackages() = }")
-                print(f"PYTEST_CURRENT_TEST: {os.getenv("PYTEST_CURRENT_TEST")}")
-                print(f"{pth_file = }")
+        pth_file = Path(pth_dir) / "subcover.pth"
         try:
             pth_file.write_text("import coverage; coverage.process_startup()\n", encoding="utf-8")
         except OSError:  # pragma: cant happen

tests/coveragetest.py

@@ -463,17 +463,11 @@ def run_command_status(self, cmd: str) -> tuple[int, str]:
             # The invocation requests the coverage.py program.  Substitute the
             # actual coverage.py main command name.
             command_words = [self.coverage_command]
-            command_words = [sys.executable, "-m", "coverage"]
 
         else:
             command_words = [command_name]
 
         cmd = " ".join([shlex.quote(w) for w in command_words] + command_args)
-        import contextlib # DELETE ME
-        with open("/tmp/foo.out", "a", encoding="utf-8") as f:
-            with contextlib.redirect_stdout(f):
-                print(f"{command_words = }")
-                print(f"{cmd = }")
 
         self.last_command_status, self.last_command_output = run_command(cmd)
         print(self.last_command_output)

tests/test_process.py

@@ -1332,7 +1332,7 @@ def setUp(self) -> None:
         self.make_file("main.py", """\
             import os, os.path, sys
             ex = os.path.basename(sys.executable)
-            os.system(sys.executable + " sub.py")
+            os.system(ex + " sub.py")
             """)
         # sub.py will write a few lines.
         self.make_file("sub.py", """\
@@ -1346,15 +1346,7 @@ def test_patch_subprocess(self) -> None:
             [run]
             patch = subprocess
             """)
-        import contextlib # DELETE ME
-        with open("/tmp/foo.out", "a", encoding="utf-8") as f:
-            with contextlib.redirect_stdout(f):
-                print(f"-- about to: coverage run main.py")
         self.run_command("coverage run main.py")
-        import contextlib # DELETE ME
-        with open("/tmp/foo.out", "a", encoding="utf-8") as f:
-            with contextlib.redirect_stdout(f):
-                print(f"-- about to: coverage combine")
         self.run_command("coverage combine")
         self.assert_exists(".coverage")
         data = coverage.CoverageData()