From a8455886407b398fd8a92d3b4c1a922955d8c276 Mon Sep 17 00:00:00 2001
From: icanhasmath <marcg@activestate.com>
Date: Mon, 9 Nov 2026 10:41:15 -0600
Subject: [PATCH 1/2] Report a three-part version string; carry the ActiveState
 release in build info

PY_VERSION was "3.10.22.N", so sys.version, platform.python_version() and
platform.python_version_tuple() had four components.  Third-party code
unpacks them into (major, minor, patchlevel): prometheus_client's
PlatformCollector fails with "ValueError: too many values to unpack
(expected 3)" at import, which breaks jupyter_server and nbclassic.

PY_VERSION goes back to upstream's "3.10.22".  The release moves to a new
PY_ACTIVESTATE_VERSION macro, which leads the build information
(sys.version is now "3.10.22 (ActiveState 3.10.22.N, <date>, <time>) [...]",
platform.python_build()[0] is "ActiveState 3.10.22.N") and the Windows
FileVersion/ProductVersion strings.  The build number field stays free of
commas because platform._sys_version() parses at most three fields there.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 Include/patchlevel.h      |  9 ++++++++-
 Lib/test/test_platform.py | 14 ++++++++++++++
 Modules/getbuildinfo.c    | 12 ++++++++----
 PC/python_ver_rc.h        |  5 +++--
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 709298cc4b30a4f..fc1ff10ff5a805d 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,9 +23,16 @@
 #define PY_RELEASE_SERIAL       0
 
 /* Version as a string */
-#define PY_VERSION              "3.10.22.3"
+#define PY_VERSION              "3.10.22"
 /*--end constants--*/
 
+/* ActiveState release of the 3.10 line.  PY_VERSION keeps upstream's three
+   components because third-party code unpacks sys.version and
+   platform.python_version_tuple() into (major, minor, patchlevel); the
+   release is reported in the build information instead (sys.version,
+   platform.python_build()) and in the Windows file version strings. */
+#define PY_ACTIVESTATE_VERSION  "3.10.22.3"
+
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
    Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
 #define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index 2d41166644ab74d..1b71c34ea9818bf 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -204,6 +204,20 @@ def test_sys_version(self):
             self.assertEqual(platform.python_build(), info[4])
             self.assertEqual(platform.python_compiler(), info[5])
 
+    def test_running_version_has_three_components(self):
+        # The ActiveState release number (3.10.22.N) is carried in the build
+        # information, not in the version string: third-party code unpacks
+        # python_version_tuple() and sys.version into (major, minor, patch).
+        self.clear_caches()
+        expected = '%d.%d.%d' % sys.version_info[:3]
+        self.assertEqual(sys.version.split()[0], expected)
+        self.assertEqual(platform.python_version(), expected)
+        major, minor, patchlevel = platform.python_version_tuple()
+        self.assertEqual('.'.join((major, minor, patchlevel)), expected)
+        self.assertTrue(
+            platform.python_build()[0].startswith('ActiveState %s.' % expected),
+            platform.python_build())
+
     def test_system_alias(self):
         res = platform.system_alias(
             platform.system(),
diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
index 7cb7397a22c8ab7..c06b0663026fe9c 100644
--- a/Modules/getbuildinfo.c
+++ b/Modules/getbuildinfo.c
@@ -34,18 +34,22 @@
 const char *
 Py_GetBuildInfo(void)
 {
-    static char buildinfo[50 + sizeof(GITVERSION) +
+    static char buildinfo[50 + sizeof("ActiveState ") +
+                          sizeof(PY_ACTIVESTATE_VERSION) + sizeof(GITVERSION) +
                           ((sizeof(GITTAG) > sizeof(GITBRANCH)) ?
                            sizeof(GITTAG) : sizeof(GITBRANCH))];
     const char *revision = _Py_gitversion();
     const char *sep = *revision ? ":" : "";
     const char *gitid = _Py_gitidentifier();
-    if (!(*gitid)) {
+    if (!(*gitid) && *revision) {
         gitid = "main";
     }
+    /* The ActiveState release leads the build number field, which has no
+       commas: platform._sys_version() parses at most three fields here. */
     PyOS_snprintf(buildinfo, sizeof(buildinfo),
-                  "%s%s%s, %.20s, %.9s", gitid, sep, revision,
-                  DATE, TIME);
+                  "ActiveState %s%s%s%s%s, %.20s, %.9s",
+                  PY_ACTIVESTATE_VERSION, *gitid ? " " : "", gitid,
+                  sep, revision, DATE, TIME);
     return buildinfo;
 }
 
diff --git a/PC/python_ver_rc.h b/PC/python_ver_rc.h
index 5b55b810cd21523..b67711abefd8886 100644
--- a/PC/python_ver_rc.h
+++ b/PC/python_ver_rc.h
@@ -17,9 +17,10 @@
 #endif
 
 /* e.g., 3.3.0a1
- * PY_VERSION comes from patchlevel.h
+ * PY_ACTIVESTATE_VERSION comes from patchlevel.h: the file version strings
+ * name the ActiveState release (3.10.22.N), not just PY_VERSION.
  */
-#define PYTHON_VERSION PY_VERSION "\0"
+#define PYTHON_VERSION PY_ACTIVESTATE_VERSION "\0"
 
 /* 64-bit version number as comma-separated list of 4 16-bit ints */
 #if PY_MICRO_VERSION > 64

From 15974e7374a06075331a1bad37fc6f5972d4fcd2 Mon Sep 17 00:00:00 2001
From: icanhasmath <marcg@activestate.com>
Date: Mon, 9 Nov 2026 10:41:27 -0600
Subject: [PATCH 2/2] Update version to 3.10.22.4 and add release notes

ActiveState release of the end-of-life 3.10 line, on top of 3.10.22.3:
the version string reports three components again, and the ActiveState
release moves into the build information.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 Doc/whatsnew/3.10.rst | 25 +++++++++++++++++++++++++
 Include/patchlevel.h  |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index 1bebb25756b653c..c824e9a9705aacc 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -2552,3 +2552,28 @@ Build Changes
   ``XML_SetHashSalt16Bytes``, which Expat 2.9.0 added, so every function of
   the bundled Expat carries the ``PyExpat_`` prefix and cannot clash with
   another copy of Expat loaded in the same process.
+
+
+Notable changes in 3.10.22.4
+============================
+
+This is an ActiveState release of the 3.10 line, on top of 3.10.22.3.
+
+Version reporting
+-----------------
+
+* The version string is back to upstream's three components.
+  :data:`sys.version`, :func:`platform.python_version` and the output of
+  ``python -V`` now report ``3.10.22``, and
+  :func:`platform.python_version_tuple` returns ``('3', '10', '22')``.
+  Releases 3.10.22.1 to 3.10.22.3 reported four components, and code that
+  unpacks the version into ``(major, minor, patchlevel)`` failed: for example,
+  importing ``prometheus_client`` (and so ``jupyter_server`` and
+  ``nbclassic``) raised ``ValueError: too many values to unpack``.
+* The ActiveState release is reported in the build information instead.
+  :data:`sys.version` and ``python -VV`` read
+  ``3.10.22 (ActiveState 3.10.22.4, <date>, <time>) [<compiler>]``, and
+  :func:`platform.python_build` returns ``('ActiveState 3.10.22.4', <date>)``.
+  On Windows, the file and product version strings of the executables and
+  DLLs still read ``3.10.22.4``.  C code can use the new
+  ``PY_ACTIVESTATE_VERSION`` macro from :file:`patchlevel.h`.
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index fc1ff10ff5a805d..8a10f57168a9e8a 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -31,7 +31,7 @@
    platform.python_version_tuple() into (major, minor, patchlevel); the
    release is reported in the build information instead (sys.version,
    platform.python_build()) and in the Windows file version strings. */
-#define PY_ACTIVESTATE_VERSION  "3.10.22.3"
+#define PY_ACTIVESTATE_VERSION  "3.10.22.4"
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
    Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */