remove site.py patch, fixed upstream

Author: jjhelmus

cpython-unix/build-cpython.sh

@@ -338,12 +338,6 @@ if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_15}" ]; then
     patch -p1 -i "${ROOT}/patch-testinternalcapi-interpreter-extern.patch"
 fi
 
-# Apply https://github.com/python/cpython/pull/149516 for a 3.15.0b1
-# site startup regression.
-if [ "${PYTHON_MAJMIN_VERSION}" = "3.15" ]; then
-    patch -p1 -i "${ROOT}/patch-site-reentrant-startup-files-3.15.patch"
-fi
-
 # Most bits look at CFLAGS. But setup.py only looks at CPPFLAGS.
 # So we need to set both.
 CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC -I${TOOLS_PATH}/deps/include -I${TOOLS_PATH}/deps/include/ncursesw"

cpython-unix/patch-site-reentrant-startup-files-3.15.patch

@@ -311,30 +311,6 @@ def static_replace_in_file(p: pathlib.Path, search, replace):
         fh.write(data)
 
 
-def apply_source_patch(cpython_source_path: pathlib.Path, patch_path: pathlib.Path):
-    with patch_path.open("rb") as fh:
-        patch = fh.read().replace(b"\r\n", b"\n")
-
-    with tempfile.NamedTemporaryFile("wb", delete=False) as fh:
-        fh.write(patch)
-        normalized_patch = pathlib.Path(fh.name)
-
-    try:
-        subprocess.run(
-            [
-                "git.exe",
-                "-C",
-                str(cpython_source_path),
-                "apply",
-                "--whitespace=nowarn",
-                str(normalized_patch),
-            ],
-            check=True,
-        )
-    finally:
-        normalized_patch.unlink()
-
-
 OPENSSL_PROPS_REMOVE_RULES_LEGACY = b"""
   <ItemGroup>
     <_SSLDLL Include="$(opensslOutDir)\libcrypto$(_DLLSuffix).dll" />
@@ -1523,12 +1499,6 @@ def build_cpython(
         cpython_source_path = td / ("Python-%s" % python_version)
         pcbuild_path = cpython_source_path / "PCbuild"
 
-        if python_version.startswith("3.15."):
-            apply_source_patch(
-                cpython_source_path,
-                SUPPORT / "patch-site-reentrant-startup-files-3.15.patch",
-            )
-
         out_dir = td / "out"
 
         build_dir = out_dir / "python" / "build"