Address code review

python · corona10 · May 18, 2024 · May 17, 2024 · May 18, 2024 · May 18, 2024
commit e2d60ba3ccc52668d0b6eef3920093b6bc8207f5
diff --git a/Lib/platform.py b/Lib/platform.py
@@ -1155,16 +1155,22 @@ def _sys_version(sys_version=None):
 
     sys_version_parser = re.compile(
         r'([\w.+]+)\s*'  # "version<space>"
+        r'(free-threading)?\s*'
         r'\(#?([^,]+)'  # "(#buildno"
         r'(?:,\s*([\w ]*)'  # ", builddate"
-        r'(?:,\s*([\w :]*))?)?'  # ", buildtime"
-        r'(?:,\s*(free-threading))?\)*\s*'  # ",'free-threading')<space>'"
+        r'(?:,\s*([\w :]*))?)?\)\s*'  # ", buildtime)<space>"
         r'\[([^\]]+)\]?', re.ASCII)  # "[compiler]"
 
     if sys.platform.startswith('java'):
         # Jython
+        jython_sys_version_parser = re.compile(
+            r'([\w.+]+)\s*'  # "version<space>"
+            r'\(#?([^,]+)'  # "(#buildno"
+            r'(?:,\s*([\w ]*)'  # ", builddate"
+            r'(?:,\s*([\w :]*))?)?\)\s*'  # ", buildtime)<space>"
+            r'\[([^\]]+)\]?', re.ASCII)  # "[compiler]"
         name = 'Jython'
-        match = sys_version_parser.match(sys_version)
+        match = jython_sys_version_parser.match(sys_version)
         if match is None:
             raise ValueError(
                 'failed to parse Jython sys.version: %s' %
@@ -1191,12 +1197,19 @@ def _sys_version(sys_version=None):
 
     else:
         # CPython
-        match = sys_version_parser.match(sys_version)
+        cpython_sys_version_parser = re.compile(
+            r'([\w.+]+)\s*'  # "version<space>"
+            r'(free-threading)?\s*'
+            r'\(#?([^,]+)'  # "(#buildno"
+            r'(?:,\s*([\w ]*)'  # ", builddate"
+            r'(?:,\s*([\w :]*))?)?\)\s*'  # ", buildtime)<space>"
+            r'\[([^\]]+)\]?', re.ASCII)  # "[compiler]"
+        match = cpython_sys_version_parser.match(sys_version)
         if match is None:
             raise ValueError(
                 'failed to parse CPython sys.version: %s' %
                 repr(sys_version))
-        version, buildno, builddate, buildtime, _, compiler = \
+        version, _, buildno, builddate, buildtime, compiler = \
               match.groups()
         name = 'CPython'
         if builddate is None:

diff --git a/Misc/NEWS.d/next/Build/2024-05-17-19-53-27.gh-issue-119132.wepPgM.rst b/Misc/NEWS.d/next/Build/2024-05-17-19-53-27.gh-issue-119132.wepPgM.rst
@@ -1,2 +1,2 @@
-Add build information to identify whether the build is default build or
+Update data:`sys.version` to identify whether the build is default build or
 free-threading build. Patch By Donghee Na.
diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c
@@ -54,16 +54,9 @@ Py_GetBuildInfo(void)
     if (!(*gitid)) {
         gitid = "main";
     }
-#ifdef Py_GIL_DISABLED
-    const char *build = "free-threading";
-    PyOS_snprintf(buildinfo, sizeof(buildinfo),
-                  "%s%s%s, %.20s, %.9s, %s", gitid, sep, revision,
-                  DATE, TIME, build);
-#else
     PyOS_snprintf(buildinfo, sizeof(buildinfo),
                   "%s%s%s, %.20s, %.9s", gitid, sep, revision,
                   DATE, TIME);
-#endif
     return buildinfo;
 }
 

diff --git a/Python/getversion.c b/Python/getversion.c
@@ -14,7 +14,12 @@ void _Py_InitVersion(void)
         return;
     }
     initialized = 1;
-    PyOS_snprintf(version, sizeof(version), "%.80s (%.80s) %.80s",
+#ifdef Py_GIL_DISABLED
+    const char *buildinfo_format = "%.80s free-threading (%.80s) %.80s";
+#else
+    const char *buildinfo_format = "%.80s (%.80s) %.80s";
+#endif
+    PyOS_snprintf(version, sizeof(version), buildinfo_format,
                   PY_VERSION, Py_GetBuildInfo(), Py_GetCompiler());
 }