From a7afdf9744636d520297a26d833a6b3d5f738f6a Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Thu, 5 Dec 2024 11:19:30 +0100 Subject: [PATCH 1/2] gh-127503 Don't propagate native PATH to Emscripten Python This makes `shutil.which()` pick up native executables which is inconvenient. --- Tools/wasm/emscripten/node_entry.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/wasm/emscripten/node_entry.mjs b/Tools/wasm/emscripten/node_entry.mjs index 40ab1515cf28c1..c195ad15520396 100644 --- a/Tools/wasm/emscripten/node_entry.mjs +++ b/Tools/wasm/emscripten/node_entry.mjs @@ -35,6 +35,7 @@ const settings = { mountDirectories(Module); Module.FS.chdir(process.cwd()); Object.assign(Module.ENV, process.env); + delete Module.ENV.PATH; }, // Ensure that sys.executable, sys._base_executable, etc point to python.sh // not to this file. To properly handle symlinks, python.sh needs to compute From 639bcedc303c43acb9de0b41f156523b5f8c7a2c Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Thu, 5 Dec 2024 14:23:48 +0100 Subject: [PATCH 2/2] Fix thisProgram arguemnt --- Tools/wasm/emscripten/node_entry.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/wasm/emscripten/node_entry.mjs b/Tools/wasm/emscripten/node_entry.mjs index c195ad15520396..98b8f572a7e762 100644 --- a/Tools/wasm/emscripten/node_entry.mjs +++ b/Tools/wasm/emscripten/node_entry.mjs @@ -40,7 +40,7 @@ const settings = { // Ensure that sys.executable, sys._base_executable, etc point to python.sh // not to this file. To properly handle symlinks, python.sh needs to compute // its own path. - thisProgram: process.argv[thisProgramIndex], + thisProgram: process.argv[thisProgramIndex].slice(thisProgram.length), // After python.sh come the arguments thatthe user passed to python.sh. arguments: process.argv.slice(thisProgramIndex + 1), };