From: Victor Stinner Date: Mon, 30 Mar 2026 09:25:11 +0000 (+0200) Subject: gh-146444: Make Platforms/Apple/ compatible with Python 3.9 (#146624) X-Git-Tag: v3.15.0a8~118 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=382c04308d7c3638fc0402116ce8654b80b4b776;p=thirdparty%2FPython%2Fcpython.git gh-146444: Make Platforms/Apple/ compatible with Python 3.9 (#146624) Replace "str | None" with typing.Union[str, None]. --- diff --git a/Platforms/Apple/.ruff.toml b/Platforms/Apple/.ruff.toml index f5d74fdb6afe..a10de0edb804 100644 --- a/Platforms/Apple/.ruff.toml +++ b/Platforms/Apple/.ruff.toml @@ -1,5 +1,8 @@ extend = "../../.ruff.toml" # Inherit the project-wide settings +# iOS buildbot worker uses Python 3.9 +target-version = "py39" + [format] preview = true docstring-code-format = true diff --git a/Platforms/Apple/__main__.py b/Platforms/Apple/__main__.py index c646a222bc63..9b51f8a3b755 100644 --- a/Platforms/Apple/__main__.py +++ b/Platforms/Apple/__main__.py @@ -52,9 +52,10 @@ from datetime import datetime, timezone from os.path import basename, relpath from pathlib import Path from subprocess import CalledProcessError +from typing import Union EnvironmentT = dict[str, str] -ArgsT = Sequence[str | Path] +ArgsT = Sequence[Union[str, Path]] SCRIPT_NAME = Path(__file__).name PYTHON_DIR = Path(__file__).resolve().parent.parent.parent diff --git a/Platforms/Apple/testbed/__main__.py b/Platforms/Apple/testbed/__main__.py index 0dd77ab8b827..96da1f9c7525 100644 --- a/Platforms/Apple/testbed/__main__.py +++ b/Platforms/Apple/testbed/__main__.py @@ -7,6 +7,7 @@ import shutil import subprocess import sys from pathlib import Path +from typing import Union TEST_SLICES = { "iOS": "ios-arm64_x86_64-simulator", @@ -262,7 +263,7 @@ def update_test_plan(testbed_path, platform, args): def run_testbed( platform: str, - simulator: str | None, + simulator: Union[str, None], args: list[str], verbose: bool = False, ):