https://github.com/python/cpython/commit/0e982b15705ae86e2b52ce12d47ca965b1bd3fe9 commit: 0e982b15705ae86e2b52ce12d47ca965b1bd3fe9 branch: 3.15 author: Miss Islington (bot) <[email protected]> committer: hugovk <[email protected]> date: 2026-11-02T12:13:13+02:00 summary:
[3.15] macOS installer: Properly pluralise "architectures" (GH-160759) (#161163) Co-authored-by: Hugo van Kemenade <[email protected]> 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 667dc433a96600d..dcfc3907837a567 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -1403,7 +1403,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]
