From 836e5abfb3616c025c82bf99f5bd7c7b7ab97627 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Mon, 30 Mar 2026 11:41:50 +0200 Subject: [PATCH] [3.14] gh-146444: Make Platforms/Apple/ compatible with Python 3.9 (GH-146624) (#146627) gh-146444: Make Platforms/Apple/ compatible with Python 3.9 (GH-146624) Replace "str | None" with typing.Union[str, None]. (cherry picked from commit 382c04308d7c3638fc0402116ce8654b80b4b776) Co-authored-by: Victor Stinner --- Apple/.ruff.toml | 3 +++ Apple/__main__.py | 3 ++- Apple/testbed/__main__.py | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Apple/.ruff.toml b/Apple/.ruff.toml index 4cdc39ebee4b..ce3be314f690 100644 --- a/Apple/.ruff.toml +++ b/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/Apple/__main__.py b/Apple/__main__.py index 96b8cb2a0121..862a471cb8c1 100644 --- a/Apple/__main__.py +++ b/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 diff --git a/Apple/testbed/__main__.py b/Apple/testbed/__main__.py index 0dd77ab8b827..96da1f9c7525 100644 --- a/Apple/testbed/__main__.py +++ b/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, ): -- 2.47.3