From 2991194943d64d51515000cf94f12ae299a35a5b Mon Sep 17 00:00:00 2001 From: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Date: Thu, 16 Oct 2025 10:49:08 +0100 Subject: [PATCH] gh-140170: Fix test_site with -s flag (GH-140179) Commit (cherry picked from commit 7ac94fcb1d09796f55faeaf30e349a86a88f7ed6) Co-authored-by: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> --- Lib/test/test_site.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 39c451fbbbba41..f8c6f37c607cfb 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -846,12 +846,15 @@ def get_excepted_output(self, *args): return 10, None def invoke_command_line(self, *args): - args = ["-m", "site", *args] + cmd_args = [] + if sys.flags.no_user_site: + cmd_args.append("-s") + cmd_args.extend(["-m", "site", *args]) with EnvironmentVarGuard() as env: env["PYTHONUTF8"] = "1" env["PYTHONIOENCODING"] = "utf-8" - proc = spawn_python(*args, text=True, env=env, + proc = spawn_python(*cmd_args, text=True, env=env, encoding='utf-8', errors='replace') output = kill_python(proc)