From fa711a0c3d7755c62fb37aaee94ac718d381d47c Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Tue, 29 Apr 2025 00:28:48 +0100
Subject: [PATCH 1/3] Display 'free-threaded' in pymanager builds

---
 PC/layout/support/pymanager.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/PC/layout/support/pymanager.py b/PC/layout/support/pymanager.py
index b57e41bee51207..03e177b3704ab6 100644
--- a/PC/layout/support/pymanager.py
+++ b/PC/layout/support/pymanager.py
@@ -39,7 +39,6 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False):
     DISPLAY_NAME = "Python"
     TAG_SUFFIX = ""
     ALIAS_PREFIX = "python"
-    ALIAS_WPREFIX = "pythonw"
     FILE_PREFIX = "python-"
     FILE_SUFFIX = f"-{ns.arch}"
     DISPLAY_TAGS = [{
@@ -67,7 +66,7 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False):
         TAG_SUFFIX = "t"
         TARGET = f"python{VER_MAJOR}.{VER_MINOR}t.exe"
         TARGETW = f"pythonw{VER_MAJOR}.{VER_MINOR}t.exe"
-        DISPLAY_TAGS.append("freethreaded")
+        DISPLAY_TAGS.append("free-threaded")
         FILE_SUFFIX = f"t-{ns.arch}"
 
     FULL_TAG = f"{VER_MAJOR}.{VER_MINOR}.{VER_MICRO}{VER_SUFFIX}{TAG_SUFFIX}"
@@ -82,7 +81,7 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False):
     # Tag shown in 'py list' output
     DISPLAY_TAG = f"{XY_TAG}-dev{TAG_ARCH}" if VER_SUFFIX else XY_ARCH_TAG
 
-    DISPLAY_SUFFIX = ", ".join(i for i in DISPLAY_TAGS if i)
+    DISPLAY_SUFFIX = ", ".join(filter(None, DISPLAY_TAGS))
     if DISPLAY_SUFFIX:
         DISPLAY_SUFFIX = f" ({DISPLAY_SUFFIX})"
     DISPLAY_VERSION = f"{XYZ_VERSION}{VER_SUFFIX}{DISPLAY_SUFFIX}"

From 4ef2c44667cb02003928c188faf5fbf743fb6965 Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+aa-turner@users.noreply.github.com>
Date: Tue, 29 Apr 2025 00:40:48 +0100
Subject: [PATCH 2/3] Revert prefix change

---
 PC/layout/support/pymanager.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PC/layout/support/pymanager.py b/PC/layout/support/pymanager.py
index 03e177b3704ab6..15ceee13fc4e7a 100644
--- a/PC/layout/support/pymanager.py
+++ b/PC/layout/support/pymanager.py
@@ -39,6 +39,7 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False):
     DISPLAY_NAME = "Python"
     TAG_SUFFIX = ""
     ALIAS_PREFIX = "python"
+    ALIAS_WPREFIX = "pythonw"
     FILE_PREFIX = "python-"
     FILE_SUFFIX = f"-{ns.arch}"
     DISPLAY_TAGS = [{

From 6330ef23b8a4f30eef607069ace01c1c57cca5cc Mon Sep 17 00:00:00 2001
From: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Date: Tue, 29 Apr 2025 00:43:34 +0100
Subject: [PATCH 3/3] Revert `filter(None, ...)`

---
 PC/layout/support/pymanager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PC/layout/support/pymanager.py b/PC/layout/support/pymanager.py
index 15ceee13fc4e7a..5113b31df3d002 100644
--- a/PC/layout/support/pymanager.py
+++ b/PC/layout/support/pymanager.py
@@ -82,7 +82,7 @@ def calculate_install_json(ns, *, for_embed=False, for_test=False):
     # Tag shown in 'py list' output
     DISPLAY_TAG = f"{XY_TAG}-dev{TAG_ARCH}" if VER_SUFFIX else XY_ARCH_TAG
 
-    DISPLAY_SUFFIX = ", ".join(filter(None, DISPLAY_TAGS))
+    DISPLAY_SUFFIX = ", ".join(i for i in DISPLAY_TAGS if i)
     if DISPLAY_SUFFIX:
         DISPLAY_SUFFIX = f" ({DISPLAY_SUFFIX})"
     DISPLAY_VERSION = f"{XYZ_VERSION}{VER_SUFFIX}{DISPLAY_SUFFIX}"