Address review comments

* Register collect_bz2() and collect_lzma() in pythoninfo's collect_info().
* Do not assume a particular suffix of bz2.bzlib_version: libbz2-rs reports
  "1.1.0-libbz2-rs-sys-0.2.5" where bzip2 reports "1.0.8, 13-Jul-2019".
* Document ZLIB_RUNTIME_VERSION and zlib_version as a single entry and
  tell in which version each of them was added.
* Tell which fields the runtime *_version_info named tuples have by
  referring to their compile-time counterparts.
* Remove a line duplicated when applying a suggestion for ZLIB_VERSION_INFO.
* Fix indentation, alignment and line lengths of the added code.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: serhiy-storchaka

Doc/library/compression.zstd.rst

@@ -860,7 +860,9 @@ the following constants:
 
 .. data:: zstd_version_info
 
-   A named tuple containing the zstd library version actually loaded by the interpreter.
+   A named tuple containing the version of the zstd library
+   actually loaded by the interpreter,
+   with the same fields as :const:`ZSTD_VERSION_INFO`.
 
    .. versionchanged:: next
       It is now a named tuple.

Doc/library/lzma.rst

@@ -351,7 +351,9 @@ the following constants:
 
 .. data:: lzma_version_info
 
-   A named tuple containing the lzma library version actually loaded by the interpreter.
+   A named tuple containing the version of the lzma library
+   actually loaded by the interpreter,
+   with the same fields as :const:`LZMA_VERSION_INFO`.
 
    .. versionadded:: next
 

Doc/library/zlib.rst

@@ -483,13 +483,15 @@ the following constants:
 
 
 .. data:: ZLIB_RUNTIME_VERSION
-.. data:: zlib_version
+          zlib_version
 
    The version string of the zlib library actually loaded by the interpreter.
 
    .. versionadded:: 3.3
-   .. versionchanged:: next
-      Added alias :const:`!zlib_version`.
+      The :const:`!ZLIB_RUNTIME_VERSION` constant.
+
+   .. versionadded:: next
+      The :const:`!zlib_version` alias.
 
 
 .. data:: ZLIB_VERSION_INFO
@@ -498,7 +500,6 @@ the following constants:
    version that was used for building the module:
    *major*, *minor*, *revision*, and *subversion*.
    All values are integers.
-   The components can also be accessed by name, so ``zlib.VERSION_INFO[0]``
    The components can also be accessed by name, so ``zlib.ZLIB_VERSION_INFO[0]``
    is equivalent to ``zlib.ZLIB_VERSION_INFO.major`` and so on.
    This may be different from the zlib library actually used at runtime, which
@@ -509,7 +510,9 @@ the following constants:
 
 .. data:: zlib_version_info
 
-   A named tuple containing the zlib library version actually loaded by the interpreter.
+   A named tuple containing the version of the zlib library
+   actually loaded by the interpreter,
+   with the same fields as :const:`ZLIB_VERSION_INFO`.
 
    .. versionadded:: next
 
@@ -529,8 +532,9 @@ the module:
 
 .. data:: ZLIBNG_VERSION_INFO
 
-   A named tuple containing the version of the zlib-ng library that was
-   used for building the module if zlib-ng was used.
+   A named tuple containing the three components of the zlib-ng library
+   version that was used for building the module:
+   *major*, *minor*, and *revision*.  All values are integers.
 
    .. versionadded:: next
 

Doc/whatsnew/3.16.rst

@@ -372,6 +372,7 @@ Add :meth:`~ipaddress.IPv4Network.next_network` and
 :meth:`~ipaddress.IPv6Network.next_network` methods to find the next nearest
 network with a specific prefix size.
 
+
 logging
 -------
 

Lib/bz2.py

@@ -5,7 +5,8 @@
 """
 
 __all__ = ["BZ2File", "BZ2Compressor", "BZ2Decompressor",
-           "open", "compress", "decompress", "bzlib_version", "bzlib_version_info"]
+           "open", "compress", "decompress",
+           "bzlib_version", "bzlib_version_info"]
 
 __author__ = "Nadeem Vawda <nadeem.vawda@gmail.com>"
 
@@ -14,7 +15,8 @@
 import io
 import os
 
-from _bz2 import BZ2Compressor, BZ2Decompressor, bzlib_version, bzlib_version_info
+from _bz2 import (BZ2Compressor, BZ2Decompressor,
+                  bzlib_version, bzlib_version_info)
 
 
 # Value 0 no longer used

Lib/test/pythoninfo.py

@@ -1354,6 +1354,7 @@ def collect_info(info):
         collect_urandom,
 
         collect_builtins,
+        collect_bz2,
         collect_cc,
         collect_curses,
         collect_datetime,
@@ -1364,6 +1365,7 @@ def collect_info(info):
         collect_gdbm,
         collect_get_config,
         collect_locale,
+        collect_lzma,
         collect_os,
         collect_platform,
         collect_pwd,

Lib/test/test_bz2.py

@@ -1244,7 +1244,9 @@ def test_bzlib_version(self):
         self.assertGreaterEqual(v.minor, 0)
         self.assertGreaterEqual(v.patch, 0)
 
-        self.assertEqual(bz2.bzlib_version.split(',')[0], '%d.%d.%d' % v)
+        # The version string can have a suffix, e.g. "1.0.8, 13-Jul-2019"
+        # for bzip2 or "1.1.0-libbz2-rs-sys-0.2.5" for libbz2-rs.
+        self.assertStartsWith(bz2.bzlib_version, '%d.%d.%d' % v)
 
 
 def tearDownModule():

Lib/test/test_lzma.py

@@ -1536,7 +1536,7 @@ def _test_lzma_version(self, v, string):
         if v.stability == 'stable':
             self.assertEqual(string, '%d.%d.%d' % v[:3])
         else:
-            self.assertTrue(string.startswith('%d.%d.%d%s' % v))
+            self.assertStartsWith(string, '%d.%d.%d%s' % v)
 
     def test_lzma_version(self):
         if support.verbose:

Lib/test/test_zlib.py

@@ -100,9 +100,11 @@ def test_zlib_version(self):
             print(f'ZLIB_VERSION_INFO = {zlib.ZLIB_VERSION_INFO}', flush=True)
             print(f'zlib_version_info = {zlib.zlib_version_info}', flush=True)
         self._test_zlib_version(zlib.ZLIB_VERSION_INFO)
-        self.assertEqual(zlib.ZLIB_VERSION_INFO, _parse_version(zlib.ZLIB_VERSION))
+        self.assertEqual(zlib.ZLIB_VERSION_INFO,
+                         _parse_version(zlib.ZLIB_VERSION))
         self._test_zlib_version(zlib.zlib_version_info)
-        self.assertEqual(zlib.zlib_version_info, _parse_version(zlib.zlib_version))
+        self.assertEqual(zlib.zlib_version_info,
+                         _parse_version(zlib.zlib_version))
         self.assertEqual(zlib.ZLIB_RUNTIME_VERSION, zlib.zlib_version)
 
     def _test_zlibng_version(self, v):
@@ -125,9 +127,11 @@ def _test_zlibng_version(self, v):
     def test_zlibng_version(self):
         if support.verbose:
             print(f'ZLIBNG_VERSION = {zlib.ZLIBNG_VERSION}', flush=True)
-            print(f'ZLIBNG_VERSION_INFO = {zlib.ZLIBNG_VERSION_INFO}', flush=True)
+            print(f'ZLIBNG_VERSION_INFO = {zlib.ZLIBNG_VERSION_INFO}',
+                  flush=True)
         self._test_zlibng_version(zlib.ZLIBNG_VERSION_INFO)
-        self.assertEqual(zlib.ZLIBNG_VERSION, '%d.%d.%d' % zlib.ZLIBNG_VERSION_INFO)
+        self.assertEqual(zlib.ZLIBNG_VERSION,
+                         '%d.%d.%d' % zlib.ZLIBNG_VERSION_INFO)
 
 
 class ChecksumTestCase(unittest.TestCase):

Modules/_bz2module.c

@@ -761,9 +761,9 @@ static PyStructSequence_Field bzlib_version_fields[] = {
 };
 
 static PyStructSequence_Desc bzlib_version_desc = {
-    "_bz2.bzlib_version_info",    /* name */
-    bzlib_version__doc__,    /* doc */
-    bzlib_version_fields,    /* fields */
+    "_bz2.bzlib_version_info",   /* name */
+    bzlib_version__doc__,        /* doc */
+    bzlib_version_fields,        /* fields */
     3
 };