From b0ec192164e82e7cdb8d4e168445a2e50a4a9744 Mon Sep 17 00:00:00 2001
From: Aaron Clarke <aaclarke@google.com>
Date: Wed, 16 Oct 2024 10:49:27 -0700
Subject: [PATCH 1/2] Started using a specific python for yapf

---
 tools/yapf.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/yapf.sh b/tools/yapf.sh
index 48d0974a0102a..e2f98ccaba2cc 100755
--- a/tools/yapf.sh
+++ b/tools/yapf.sh
@@ -36,5 +36,15 @@ function follow_links() (
 SCRIPT_DIR=$(follow_links "$(dirname -- "${BASH_SOURCE[0]}")")
 SRC_DIR="$(cd "$SCRIPT_DIR/../.."; pwd -P)"
 YAPF_DIR="$(cd "$SRC_DIR/flutter/third_party/yapf"; pwd -P)"
+if command -v python3.10 &> /dev/null; then
+  PYTHON_EXEC="python3.10"
+else
+  python_version=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
+  if [[ $(echo "$python_version > 3.10" | bc) -eq 1 ]]; then
+    echo "Error: python3 version $python_version, yapf requires < 3.11" >&2
+    exit 1
+  fi
+  PYTHON_EXEC="python3"
+fi
 
-PYTHONPATH="$YAPF_DIR" python3 "$YAPF_DIR/yapf" "$@"
+PYTHONPATH="$YAPF_DIR" $PYTHON_EXEC "$YAPF_DIR/yapf" "$@"

From 5cfd796df1821ca104d658fc384d03abe5fed954 Mon Sep 17 00:00:00 2001
From: Aaron Clarke <aaclarke@google.com>
Date: Wed, 16 Oct 2024 10:59:16 -0700
Subject: [PATCH 2/2] moved the version check into python

---
 tools/yapf.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/yapf.sh b/tools/yapf.sh
index e2f98ccaba2cc..bab007132dbaf 100755
--- a/tools/yapf.sh
+++ b/tools/yapf.sh
@@ -39,11 +39,15 @@ YAPF_DIR="$(cd "$SRC_DIR/flutter/third_party/yapf"; pwd -P)"
 if command -v python3.10 &> /dev/null; then
   PYTHON_EXEC="python3.10"
 else
-  python_version=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
-  if [[ $(echo "$python_version > 3.10" | bc) -eq 1 ]]; then
-    echo "Error: python3 version $python_version, yapf requires < 3.11" >&2
-    exit 1
-  fi
+  python3 -c "
+import sys
+version = sys.version_info
+if (version.major, version.minor) > (3, 10):
+    print(f'Error: python3 version {version.major}.{version.minor} is greater than 3.10.', file=sys.stderr)
+    sys.exit(1)
+else:
+    print(f'Using python3 version {version.major}.{version.minor}.')
+" || exit 1
   PYTHON_EXEC="python3"
 fi