From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 19 May 2026 20:57:21 +0000 (+0200)
Subject: [3.15] gh-124111: Keep tests passing for Tcl prior to 9.0 (GH-150102)
X-Git-Tag: v3.15.0b2~121
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=021381759f7161ab4e93a67f87c9c140e7ebd0ed;p=thirdparty%2FPython%2Fcpython.git

[3.15] gh-124111: Keep tests passing for Tcl prior to 9.0 (GH-150102)

Also disables the UWP build in CI, since it was breaking (and is no longer released).
(cherry picked from commit ec9ce3ee98c68f235be6d075fa4bbd8f56d20256)

Co-authored-by: Steve Dower <steve.dower@python.org>
---

diff --git a/.github/workflows/reusable-windows.yml b/.github/workflows/reusable-windows.yml
index 4c8d0c8a2f98..c6e8128884e9 100644
--- a/.github/workflows/reusable-windows.yml
+++ b/.github/workflows/reusable-windows.yml
@@ -22,8 +22,6 @@ permissions:
 
 env:
   FORCE_COLOR: 1
-  IncludeUwp: >-
-    true
 
 jobs:
   build:
diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py
index 81a5477b496b..70731d3222ce 100644
--- a/Lib/test/test_tcl.py
+++ b/Lib/test/test_tcl.py
@@ -55,7 +55,7 @@ class TclTest(unittest.TestCase):
     def test_eval_surrogates_in_result(self):
         tcl = self.interp
         result = tcl.eval(r'set a "<\ud83d\udcbb>"')
-        if sys.platform == 'win32':
+        if sys.platform == 'win32' and tcl_version >= (9, 0):
             self.assertEqual('<\ud83d\udcbb>', result)
         else:
             self.assertEqual('<\U0001f4bb>', result)
@@ -294,7 +294,7 @@ class TclTest(unittest.TestCase):
             """)
         tcl.evalfile(filename)
         result = tcl.eval('set b')
-        if sys.platform == 'win32':
+        if sys.platform == 'win32' and tcl_version >= (9, 0):
             self.assertEqual('<\ud83d\udcbb>', result)
         else:
             self.assertEqual('<\U0001f4bb>', result)