https://github.com/python/cpython/commit/5172ac957426f32d9912a23a06e258bf889fe274
commit: 5172ac957426f32d9912a23a06e258bf889fe274
branch: main
author: Hugo van Kemenade <[email protected]>
committer: hugovk <[email protected]>
date: 2026-11-02T11:38:53+02:00
summary:
macOS installer: Properly pluralise "architectures" (#160759)
files:
M Mac/BuildScript/build-installer.py
M Mac/BuildScript/resources/ReadMe.rtf
diff --git a/Mac/BuildScript/build-installer.py
b/Mac/BuildScript/build-installer.py
index f54a95b22e118fc..c45430243343cc7 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -1402,7 +1402,10 @@ def patchFile(inPath, outPath):
data = data.replace('$FULL_VERSION', getFullVersion())
data = data.replace('$VERSION', getVersion())
data = data.replace('$MACOSX_DEPLOYMENT_TARGET', ''.join((DEPTARGET, ' or
later')))
- data = data.replace('$ARCHITECTURES', ",
".join(universal_opts_map[UNIVERSALARCHS]))
+ archs = universal_opts_map[UNIVERSALARCHS]
+ data = data.replace('$ARCHITECTURES', ", ".join(archs))
+ data = data.replace('$ARCHITECTURE_NOUN',
+ "architecture" if len(archs) == 1 else "architectures")
data = data.replace('$INSTALL_SIZE', installSize())
data = data.replace('$THIRD_PARTY_LIBS', "\\\n".join(THIRD_PARTY_LIBS))
diff --git a/Mac/BuildScript/resources/ReadMe.rtf
b/Mac/BuildScript/resources/ReadMe.rtf
index d19b542b7e6c5a8..47f607d2f3c6ea5 100644
--- a/Mac/BuildScript/resources/ReadMe.rtf
+++ b/Mac/BuildScript/resources/ReadMe.rtf
@@ -6,7 +6,7 @@
\margl1440\margr1440\vieww15140\viewh15740\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
-\f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS
$MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\
+\f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS
$MACOSX_DEPLOYMENT_TARGET for the following $ARCHITECTURE_NOUN: $ARCHITECTURES.\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
