diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index 859d2932c33fed..808b21c6617551 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -207,7 +207,7 @@ def test_kill(self):
def test_kill_issue43884(self):
if sys.platform == 'win32':
- blocking_shell_command = f'{sys.executable} -c "import time; time.sleep(2)"'
+ blocking_shell_command = f'"{sys.executable}" -c "import time; time.sleep(2)"'
else:
blocking_shell_command = 'sleep 1; sleep 1'
creationflags = 0
@@ -745,7 +745,10 @@ async def check_stdout_output(self, coro, output):
def test_create_subprocess_env_shell(self) -> None:
async def main() -> None:
- cmd = f'''{sys.executable} -c "import os, sys; sys.stdout.write(os.getenv('FOO'))"'''
+ executable = sys.executable
+ if sys.platform == "win32":
+ executable = f'"{executable}"'
+ cmd = f'''{executable} -c "import os, sys; sys.stdout.write(os.getenv('FOO'))"'''
env = os.environ.copy()
env["FOO"] = "bar"
proc = await asyncio.create_subprocess_shell(
diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
index 3da6173cfd3f13..2528a51240fbf7 100644
--- a/Lib/test/test_launcher.py
+++ b/Lib/test/test_launcher.py
@@ -90,6 +90,12 @@
"test-command=TEST_EXE.exe",
])
+
+def quote(s):
+ s = str(s)
+ return f'"{s}"' if " " in s else s
+
+
def create_registry_data(root, data):
def _create_registry_data(root, key, value):
if isinstance(value, dict):
@@ -542,10 +548,10 @@ def test_virtualenv_with_env(self):
data1 = self.run_py([], env={**env, "PY_PYTHON": "PythonTestSuite/3"})
data2 = self.run_py(["-V:PythonTestSuite/3"], env={**env, "PY_PYTHON": "PythonTestSuite/3"})
# Compare stdout, because stderr goes via ascii
- self.assertEqual(data1["stdout"].strip(), str(venv_exe))
+ self.assertEqual(data1["stdout"].strip(), quote(venv_exe))
self.assertEqual(data1["SearchInfo.lowPriorityTag"], "True")
# Ensure passing the argument doesn't trigger the same behaviour
- self.assertNotEqual(data2["stdout"].strip(), str(venv_exe))
+ self.assertNotEqual(data2["stdout"].strip(), quote(venv_exe))
self.assertNotEqual(data2["SearchInfo.lowPriorityTag"], "True")
def test_py_shebang(self):
@@ -554,7 +560,7 @@ def test_py_shebang(self):
data = self.run_py([script, "-postarg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100", data["SearchInfo.tag"])
- self.assertEqual(f"X.Y.exe -prearg {script} -postarg", data["stdout"].strip())
+ self.assertEqual(f"X.Y.exe -prearg {quote(script)} -postarg", data["stdout"].strip())
def test_python_shebang(self):
with self.py_ini(TEST_PY_DEFAULTS):
@@ -562,7 +568,7 @@ def test_python_shebang(self):
data = self.run_py([script, "-postarg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100", data["SearchInfo.tag"])
- self.assertEqual(f"X.Y.exe -prearg {script} -postarg", data["stdout"].strip())
+ self.assertEqual(f"X.Y.exe -prearg {quote(script)} -postarg", data["stdout"].strip())
def test_py2_shebang(self):
with self.py_ini(TEST_PY_DEFAULTS):
@@ -570,7 +576,8 @@ def test_py2_shebang(self):
data = self.run_py([script, "-postarg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100-32", data["SearchInfo.tag"])
- self.assertEqual(f"X.Y-32.exe -prearg {script} -postarg", data["stdout"].strip())
+ self.assertEqual(f"X.Y-32.exe -prearg {quote(script)} -postarg",
+ data["stdout"].strip())
def test_py3_shebang(self):
with self.py_ini(TEST_PY_DEFAULTS):
@@ -578,7 +585,8 @@ def test_py3_shebang(self):
data = self.run_py([script, "-postarg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
- self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {script} -postarg", data["stdout"].strip())
+ self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {quote(script)} -postarg",
+ data["stdout"].strip())
def test_py_shebang_nl(self):
with self.py_ini(TEST_PY_DEFAULTS):
@@ -586,7 +594,8 @@ def test_py_shebang_nl(self):
data = self.run_py([script, "-postarg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100", data["SearchInfo.tag"])
- self.assertEqual(f"X.Y.exe -prearg {script} -postarg", data["stdout"].strip())
+ self.assertEqual(f"X.Y.exe -prearg {quote(script)} -postarg",
+ data["stdout"].strip())
def test_py2_shebang_nl(self):
with self.py_ini(TEST_PY_DEFAULTS):
@@ -594,7 +603,8 @@ def test_py2_shebang_nl(self):
data = self.run_py([script, "-postarg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100-32", data["SearchInfo.tag"])
- self.assertEqual(f"X.Y-32.exe -prearg {script} -postarg", data["stdout"].strip())
+ self.assertEqual(f"X.Y-32.exe -prearg {quote(script)} -postarg",
+ data["stdout"].strip())
def test_py3_shebang_nl(self):
with self.py_ini(TEST_PY_DEFAULTS):
@@ -602,7 +612,8 @@ def test_py3_shebang_nl(self):
data = self.run_py([script, "-postarg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
- self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {script} -postarg", data["stdout"].strip())
+ self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {quote(script)} -postarg",
+ data["stdout"].strip())
def test_py_shebang_short_argv0(self):
with self.py_ini(TEST_PY_DEFAULTS):
@@ -630,7 +641,8 @@ def test_search_path(self):
[script, "-postarg"],
env={"PATH": f"{exe.parent};{os.getenv('PATH')}"},
)
- self.assertEqual(f"{exe} -prearg {script} -postarg", data["stdout"].strip())
+ self.assertEqual(f"{quote(exe)} -prearg {quote(script)} -postarg",
+ data["stdout"].strip())
def test_search_path_exe(self):
# Leave the .exe on the name to ensure we don't add it a second time
@@ -643,7 +655,8 @@ def test_search_path_exe(self):
[script, "-postarg"],
env={"PATH": f"{exe.parent};{os.getenv('PATH')}"},
)
- self.assertEqual(f"{exe} -prearg {script} -postarg", data["stdout"].strip())
+ self.assertEqual(f"{quote(exe)} -prearg {quote(script)} -postarg",
+ data["stdout"].strip())
def test_recursive_search_path(self):
stem = self.get_py_exe().stem
@@ -654,7 +667,7 @@ def test_recursive_search_path(self):
env={"PATH": f"{self.get_py_exe().parent};{os.getenv('PATH')}"},
)
# The recursive search is ignored and we get normal "py" behavior
- self.assertEqual(f"X.Y.exe {script}", data["stdout"].strip())
+ self.assertEqual(f"X.Y.exe {quote(script)}", data["stdout"].strip())
def test_install(self):
data = self.run_py(["-V:3.10"], env={"PYLAUNCHER_ALWAYS_INSTALL": "1"}, expect_returncode=111)
@@ -674,7 +687,7 @@ def test_literal_shebang_absolute(self):
with self.script("#! C:/some_random_app -witharg") as script:
data = self.run_py([script])
self.assertEqual(
- f"C:\\some_random_app -witharg {script}",
+ f"C:\\some_random_app -witharg {quote(script)}",
data["stdout"].strip(),
)
@@ -682,7 +695,7 @@ def test_literal_shebang_relative(self):
with self.script("#! ..\\some_random_app -witharg") as script:
data = self.run_py([script])
self.assertEqual(
- f"{script.parent.parent}\\some_random_app -witharg {script}",
+ f"{quote(script.parent.parent / 'some_random_app')} -witharg {quote(script)}",
data["stdout"].strip(),
)
@@ -690,14 +703,14 @@ def test_literal_shebang_quoted(self):
with self.script('#! "some random app" -witharg') as script:
data = self.run_py([script])
self.assertEqual(
- f'"{script.parent}\\some random app" -witharg {script}',
+ f"{quote(script.parent / 'some random app')} -witharg {quote(script)}",
data["stdout"].strip(),
)
with self.script('#! some" random "app -witharg') as script:
data = self.run_py([script])
self.assertEqual(
- f'"{script.parent}\\some random app" -witharg {script}',
+ f"{quote(script.parent / 'some random app')} -witharg {quote(script)}",
data["stdout"].strip(),
)
@@ -705,7 +718,7 @@ def test_literal_shebang_quoted_escape(self):
with self.script('#! some\\" random "app -witharg') as script:
data = self.run_py([script])
self.assertEqual(
- f'"{script.parent}\\some\\ random app" -witharg {script}',
+ f"{quote(script.parent / 'some/ random app')} -witharg {quote(script)}",
data["stdout"].strip(),
)
@@ -714,7 +727,7 @@ def test_literal_shebang_command(self):
with self.script('#! test-command arg1') as script:
data = self.run_py([script])
self.assertEqual(
- f"TEST_EXE.exe arg1 {script}",
+ f"TEST_EXE.exe arg1 {quote(script)}",
data["stdout"].strip(),
)
@@ -723,7 +736,7 @@ def test_literal_shebang_invalid_template(self):
data = self.run_py([script])
expect = script.parent / "/usr/bin/not-python"
self.assertEqual(
- f"{expect} arg1 {script}",
+ f"{quote(expect)} arg1 {quote(script)}",
data["stdout"].strip(),
)
@@ -746,8 +759,8 @@ def test_shebang_command_in_venv(self):
with self.script(f'#! /usr/bin/env {stem} arg1') as script:
data = self.run_py([script], env=env)
- self.assertEqual(data["stdout"].strip(), f"{venv_exe} arg1 {script}")
+ self.assertEqual(data["stdout"].strip(), f"{quote(venv_exe)} arg1 {quote(script)}")
with self.script(f'#! /usr/bin/env {exe.stem} arg1') as script:
data = self.run_py([script], env=env)
- self.assertEqual(data["stdout"].strip(), f"{exe} arg1 {script}")
+ self.assertEqual(data["stdout"].strip(), f"{quote(exe)} arg1 {quote(script)}")
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 98b30d2108a1a1..ed1f304c6c8cac 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -4596,8 +4596,11 @@ def test_pipe_spawnl(self):
with open(filename, "w") as fp:
print(code, file=fp, end="")
- cmd = [sys.executable, filename]
- exitcode = os.spawnl(os.P_WAIT, cmd[0], *cmd)
+ executable = sys.executable
+ cmd = [executable, filename]
+ if os.name == "nt" and " " in cmd[0]:
+ cmd[0] = f'"{cmd[0]}"'
+ exitcode = os.spawnl(os.P_WAIT, executable, *cmd)
self.assertEqual(exitcode, 0)
diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
index ca481c57c3d972..8c074cb28a87e3 100644
--- a/Lib/test/test_webbrowser.py
+++ b/Lib/test/test_webbrowser.py
@@ -307,6 +307,7 @@ def test_get(self):
webbrowser.get('fakebrowser')
self.assertIsNotNone(webbrowser._tryorder)
+ @unittest.skipIf(" " in sys.executable, "test assumes no space in path (GH-114452)")
def test_synthesize(self):
webbrowser = import_helper.import_fresh_module('webbrowser')
name = os.path.basename(sys.executable).lower()
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy