Calculate zstd_version_info in Python

python · AA-Turner · May 9, 2025 · May 8, 2025 · May 8, 2025 · May 8, 2025
commit 3d3dbf7e0cfafa10973ace36d570d7e4eccf31f8
diff --git a/Lib/compression/zstd/__init__.py b/Lib/compression/zstd/__init__.py
@@ -28,10 +28,15 @@
 
 import _zstd
 import enum
-from _zstd import (get_frame_size, zstd_version, zstd_version_info,
-                   ZstdCompressor, ZstdDecompressor, ZstdDict, ZstdError)
+from _zstd import (ZstdCompressor, ZstdDecompressor, ZstdDict, ZstdError,
+                   get_frame_size, zstd_version)
 from compression.zstd._zstdfile import ZstdFile, open, _nbytes
 
+# zstd_version_number is (MAJOR * 100 * 100 + MINOR * 100 + RELEASE)
+zstd_version_info = (*divmod(_zstd.zstd_version_number // 100, 100),
+                     _zstd.zstd_version_number % 100)
+"""Version number of the runtime zstd library as a tuple of integers."""
+
 COMPRESSION_LEVEL_DEFAULT = _zstd.ZSTD_CLEVEL_DEFAULT
 """The default compression level for Zstandard, currently '3'."""
 

diff --git a/Modules/_zstd/_zstdmodule.c b/Modules/_zstd/_zstdmodule.c
@@ -563,19 +563,15 @@ add_vars_to_module(PyObject *m)
         return -1;                                                           \
     }
 
-    /* zstd_version, str */
-    if (PyModule_AddStringConstant(m, "zstd_version",
-                                   ZSTD_versionString()) < 0) {
+    /* zstd_version_number, int */
+    if (PyModule_AddIntConstant(m, "zstd_version_number",
+                                ZSTD_versionNumber()) < 0) {
         return -1;
     }
 
-    /* zstd_version_info, tuple of (int, int, int) */
-    const unsigned version = ZSTD_versionNumber();
-    const uint8_t v_major = version / 100 / 100;
-    const uint8_t v_minor = (version / 100) % 100;
-    const uint8_t v_release = version % 100;
-    if (PyModule_Add(m, "zstd_version_info",
-            Py_BuildValue("BBB", v_major, v_minor, v_release)) < 0) {
+    /* zstd_version, str */
+    if (PyModule_AddStringConstant(m, "zstd_version",
+                                   ZSTD_versionString()) < 0) {
         return -1;
     }