Remove runtime zlib-ng versions which are not available in compat mode.

Author: serhiy-storchaka

Doc/library/zlib.rst

@@ -526,14 +526,6 @@ the module:
 
    .. versionadded:: 3.14
 
-.. data:: zlibng_version
-
-   The version string of the zlib-ng library actually loaded
-   by the interpreter.
-
-   .. versionadded:: next
-
-
 .. data:: ZLIBNG_VERSION_INFO
 
    A named tuple containing the version of the zlib-ng library that was
@@ -542,14 +534,6 @@ the module:
    .. versionadded:: next
 
 
-.. data:: zlibng_version_info
-
-   A named tuple containing the zlib-ng library version actually loaded
-   by the interpreter.
-
-   .. versionadded:: next
-
-
 .. seealso::
 
    Module :mod:`gzip`

Doc/whatsnew/3.16.rst

@@ -150,8 +150,7 @@ zlib
 ----
 
 * Added constants :const:`~zlib.ZLIB_VERSION_INFO`,
-  :const:`~zlib.zlib_version_info`, :const:`~zlib.zlibng_version`,
-  :const:`~zlib.ZLIBNG_VERSION_INFO`, and :const:`~zlib.zlibng_version_info`,
+  :const:`~zlib.zlib_version_info`, and :const:`~zlib.ZLIBNG_VERSION_INFO`,
   which provide information about the version of the zlib and the zlib-ng
   libraries in use.
   Added :const:`~zlib.zlib_version` as an alias of

Lib/test/pythoninfo.py

@@ -660,7 +660,7 @@ def collect_zlib(info_add):
     except ImportError:
         return
 
-    attributes = ('ZLIB_VERSION', 'zlib_version', 'ZLIBNG_VERSION', 'zlibng_version')
+    attributes = ('ZLIB_VERSION', 'zlib_version', 'ZLIBNG_VERSION')
     copy_attributes(info_add, zlib, 'zlib.%s', attributes)
 
 

Lib/test/test_zlib.py

@@ -72,16 +72,6 @@ def test_library_version(self):
                          zlib.ZLIB_VERSION.split('.')[0])
         self.assertEqual(zlib.zlib_version_info[0],
                          zlib.ZLIB_VERSION_INFO[0])
-        if hasattr(zlib, 'ZLIBNG_VERSION'):
-            self.assertEqual(zlib.zlibng_version.split('.')[0],
-                             zlib.ZLIBNG_VERSION.split('.')[0])
-            self.assertEqual(zlib.zlibng_version_info[0],
-                             zlib.ZLIBNG_VERSION_INFO[0])
-        else:
-            self.assertNotHasAttr(zlib, 'ZLIBNG_VERSION')
-            self.assertNotHasAttr(zlib, 'zlibng_version')
-            self.assertNotHasAttr(zlib, 'ZLIBNG_VERSION_INFO')
-            self.assertNotHasAttr(zlib, 'zlibng_version_info')
 
     def _test_zlib_version(self, v):
         self.assertIsInstance(v[:], tuple)
@@ -135,13 +125,9 @@ 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 = {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._test_zlibng_version(zlib.zlibng_version_info)
-        self.assertEqual(zlib.zlibng_version, '%d.%d.%d' % zlib.zlibng_version_info)
 
 
 class ChecksumTestCase(unittest.TestCase):

Modules/zlibmodule.c

@@ -2375,10 +2375,6 @@ zlib_exec(PyObject *mod)
                      PyUnicode_FromString(ZLIBNG_VERSION)) < 0) {
         return -1;
     }
-    if (PyModule_Add(mod, "zlibng_version",
-                     PyUnicode_FromString(zlibng_version())) < 0) {
-        return -1;
-    }
 #endif
     PyTypeObject *version_type;
     version_type = PyStructSequence_NewType(&zlib_version_desc);
@@ -2409,12 +2405,6 @@ zlib_exec(PyObject *mod)
         Py_DECREF(version_type);
         return -1;
     }
-    if (PyModule_Add(mod, "zlibng_version_info",
-            make_zlibng_version(version_type, zlibng_version())) < 0)
-    {
-        Py_DECREF(version_type);
-        return -1;
-    }
     Py_DECREF(version_type);
 #endif
     return 0;