Expose the version as a number.

We make lzma_version be the runtime version as that is the one most
interestin to users.  The compile time version remains exposed as
the header version.

Author: gpshead

Doc/library/lzma.rst

@@ -327,20 +327,34 @@ the following constants:
 
 
 .. data:: LZMA_VERSION
+.. data:: LZMA_VERSION_STRING
 
-   The version string of the lzma library that was used for building the module.
-   This may be different from the lzma library actually used at runtime, which
-   is available as :const:`LZMA_RUNTIME_VERSION`.
+   The version of the lzma C library actually loaded at runtime, in both
+   integer and string forms.
 
    .. versionadded:: 3.13
 
+.. data:: LZMA_HEADER_VERSION
+.. data:: LZMA_HEADER_VERSION_STRING
 
-.. data:: LZMA_RUNTIME_VERSION
-
-   The version string of the lzma library actually loaded by the interpreter.
+   The version of the lzma library that was used for building the module, in
+   both integer and string forms.  This may be different from the lzma library
+   actually used at runtime.
 
    .. versionadded:: 3.13
 
+The version number and string formats are as defined in by C library. The
+integer is represented in decimal digits as ``MJJJPPPS`` where ``M`` is the
+major version, ``JJJ`` is the minor version, ``PPP`` is the patch level, and
+``S`` is the "stability indicator" (2 means stable)::
+
+   >>> import lzma
+   >>> lzma.LZMA_VERSION
+   50020052
+   >>> lzma.LZMA_VERSION_STRING
+   '5.2.5'
+
+
 .. _filter-chain-specs:
 
 Specifying custom filter chains
@@ -373,13 +387,13 @@ options. Valid filter IDs are as follows:
 
   * :const:`!FILTER_ARM64`
 
-    Only works if :data:`LZMA_RUNTIME_VERSION` is 5.4.0 or later.
+    Only works if the lzma version is 5.4.0 or later.
 
     .. versionadded:: 3.13
 
   * :const:`!FILTER_RISCV`
 
-    Only works if :data:`LZMA_RUNTIME_VERSION` is 5.6.0 or later.
+    Only works if the lzma version is 5.6.0 or later.
 
     .. versionadded:: 3.13
 

Lib/lzma.py

@@ -15,6 +15,8 @@
     "FILTER_ARM", "FILTER_ARMTHUMB", "FILTER_POWERPC", "FILTER_SPARC",
     "FILTER_ARM64", "FILTER_RISCV",
     "FORMAT_AUTO", "FORMAT_XZ", "FORMAT_ALONE", "FORMAT_RAW",
+    "LZMA_HEADER_VERSION", "LZMA_HEADER_VERSION_STRING",
+    "LZMA_VERSION", "LZMA_VERSION_STRING",
     "MF_HC3", "MF_HC4", "MF_BT2", "MF_BT3", "MF_BT4",
     "MODE_FAST", "MODE_NORMAL", "PRESET_DEFAULT", "PRESET_EXTREME",
 

Lib/test/test_lzma.py

@@ -20,16 +20,6 @@
 from lzma import LZMACompressor, LZMADecompressor, LZMAError, LZMAFile
 
 
-def _lzma_runtime_version_tuple(lzma_version=lzma.LZMA_RUNTIME_VERSION):
-    v = lzma_version.split('.', 3)
-    if not v[-1].isnumeric():
-        v[-1] = re.search(r'\d+', v[-1]).group()
-    return tuple(map(int, v))
-
-
-LZMA_RUNTIME_VERSION_TUPLE = _lzma_runtime_version_tuple()
-
-
 class CompressorDecompressorTestCase(unittest.TestCase):
 
     # Test error cases.
@@ -395,21 +385,20 @@ def test_uninitialized_LZMADecompressor_crash(self):
         self.assertEqual(LZMADecompressor.__new__(LZMADecompressor).
                          decompress(bytes()), b'')
 
-    # Test the existence of the relatively new BCJ filters.  These just
-    # ensure that the constant was found at compile time and exposed.
-
-    @unittest.skipUnless(
-            LZMA_RUNTIME_VERSION_TUPLE >= (5, 6, 0),
-            "RISC-V filter is only available on lzma 5.6.0 or later")
-    def test_riscv_filter_exists(self):
+    def test_riscv_filter_constant_exists(self):
         self.assertTrue(lzma.FILTER_RISCV)
 
-    @unittest.skipUnless(
-            LZMA_RUNTIME_VERSION_TUPLE >= (5, 4, 0),
-            "ARM64 filter is only available on lzma 5.4.0 or later")
-    def test_arm64_filter_exists(self):
+    def test_arm64_filter_constant_exists(self):
         self.assertTrue(lzma.FILTER_ARM64)
 
+    def test_lzma_header_versions(self):
+        self.assertIsInstance(lzma.LZMA_HEADER_VERSION_STRING, str)
+        self.assertGreater(lzma.LZMA_HEADER_VERSION, 0)
+
+    def test_lzma_versions(self):
+        self.assertIsInstance(lzma.LZMA_VERSION_STRING, str)
+        self.assertGreater(lzma.LZMA_VERSION, 0)
+
 
 class CompressDecompressFunctionTestCase(unittest.TestCase):
 

Modules/_lzmamodule.c

@@ -28,8 +28,7 @@
 /*
  * If the lzma.h we're building against is so old as not to define these, this
  * provides their equivalent values so that the names remain defined in Python
- * regardless.  lzma.LZMA_RUNTIME_VERSION is exposed to Python and is what
- * people can use to decide if they can use them at runtime.
+ * regardless of the header versions used at build time.
  */
 #ifndef LZMA_FILTER_ARM64
 #define LZMA_FILTER_ARM64       LZMA_VLI_C(0x0A)
@@ -1611,12 +1610,23 @@ lzma_exec(PyObject *module)
         return -1;
     }
 
-    if (PyModule_Add(module, "LZMA_VERSION",
-                     PyUnicode_FromString(LZMA_VERSION_STRING)) < 0) {
+    if (PyModule_AddStringConstant(
+                module, "LZMA_HEADER_VERSION_STRING", LZMA_VERSION_STRING) < 0) {
         return -1;
     }
-    if (PyModule_Add(module, "LZMA_RUNTIME_VERSION",
-                     PyUnicode_FromString(lzma_version_string())) < 0) {
+    if (PyModule_AddStringConstant(
+                module, "LZMA_VERSION_STRING",
+                lzma_version_string()) < 0) {
+        return -1;
+    }
+    PyObject *uint32_obj = PyLong_FromUnsignedLong(LZMA_VERSION);
+    if (PyModule_AddObject(module, "LZMA_HEADER_VERSION", uint32_obj) < 0) {
+        Py_XDECREF(uint32_obj);
+        return -1;
+    }
+    uint32_obj = PyLong_FromUnsignedLong(lzma_version_number());
+    if (PyModule_AddObject(module, "LZMA_VERSION", uint32_obj) < 0) {
+        Py_XDECREF(uint32_obj);
         return -1;
     }