Adjust docs and @requires_zlib

Author: StanFromIreland

Doc/library/shutil.rst

@@ -601,8 +601,7 @@ provided.  They rely on the :mod:`zipfile` and :mod:`tarfile` modules.
    any format-specific extension.
 
    *format* is the archive format: one of
-   "zip" (if the :mod:`zlib` module is available), "tar", "gztar" (if the
-   :mod:`zlib` module is available), "bztar" (if the :mod:`bz2` module is
+   "zip", "tar", "gztar", "bztar" (if the :mod:`bz2` module is
    available), or "xztar" (if the :mod:`lzma` module is available).
 
    *root_dir* is a directory that will be the root directory of the
@@ -653,9 +652,9 @@ provided.  They rely on the :mod:`zipfile` and :mod:`tarfile` modules.
 
    By default :mod:`shutil` provides these formats:
 
-   - *zip*: ZIP file (if the :mod:`zlib` module is available).
+   - *zip*: ZIP file.
    - *tar*: Uncompressed tar file. Uses POSIX.1-2001 pax format for new archives.
-   - *gztar*: gzip'ed tar-file (if the :mod:`zlib` module is available).
+   - *gztar*: gzip'ed tar-file.
    - *bztar*: bzip2'ed tar-file (if the :mod:`bz2` module is available).
    - *xztar*: xz'ed tar-file (if the :mod:`lzma` module is available).
 
@@ -768,10 +767,9 @@ provided.  They rely on the :mod:`zipfile` and :mod:`tarfile` modules.
 
    By default :mod:`shutil` provides these formats:
 
-   - *zip*: ZIP file (unpacking compressed files works only if the corresponding
-     module is available).
+   - *zip*: ZIP file.
    - *tar*: uncompressed tar file.
-   - *gztar*: gzip'ed tar-file (if the :mod:`zlib` module is available).
+   - *gztar*: gzip'ed tar-file.
    - *bztar*: bzip2'ed tar-file (if the :mod:`bz2` module is available).
    - *xztar*: xz'ed tar-file (if the :mod:`lzma` module is available).
 

Doc/library/test.rst

@@ -748,7 +748,12 @@ The :mod:`test.support` module defines the following functions:
 
 .. decorator:: requires_zlib
 
-   Decorator for skipping tests if :mod:`zlib` doesn't exist.
+   Decorator for skipping tests if running on WASI as :mod:`zlib` is
+   unsupported.
+
+.. versionchanged:: next
+   Test is skipped only if it is running on WASI as builds without :mod:`zlib` on
+   other systems are unsupported.
 
 
 .. decorator:: requires_gzip

Doc/library/zlib.rst

@@ -9,14 +9,11 @@
 
 For applications that require data compression, the functions in this module
 allow compression and decompression, using the zlib library. The zlib library
-has its own home page at https://www.zlib.net.   There are known
-incompatibilities between the Python module and versions of the zlib library
-earlier than 1.1.3; 1.1.3 has a `security vulnerability <https://zlib.net/zlib_faq.html#faq33>`_, so we recommend using
-1.1.4 or later.
+has its own `home page <https://www.zlib.net>`_.
 
 zlib's functions have many options and often need to be used in a particular
 order.  This documentation doesn't attempt to cover all of the permutations;
-consult the zlib manual at http://www.zlib.net/manual.html for authoritative
+consult the `zlib manual <http://www.zlib.net/manual.html>`_ for authoritative
 information.
 
 For reading and writing ``.gz`` files see the :mod:`gzip` module.

Doc/using/configure.rst

@@ -32,6 +32,10 @@ Features and minimum versions required to build CPython:
 * Autoconf 2.72 and aclocal 1.16.5 are required to regenerate the
   :file:`configure` script.
 
+* `zlib <https://zlib.net>`_ 1.1.3 is the minium version and 1.1.4 is recommended due to
+   a ` security vulnerability <https://zlib.net/zlib_faq.html#faq33>`_ for the :mod:`zlib`
+   extension module.
+
 .. versionchanged:: 3.1
    Tcl/Tk version 8.3.1 is now required.
 
@@ -61,6 +65,9 @@ Features and minimum versions required to build CPython:
 .. versionchanged:: 3.14
    Autoconf 2.72 is now required.
 
+.. versionchanged:: next
+   zlib 1.1.3 is now required.
+
 See also :pep:`7` "Style Guide for C Code" and :pep:`11` "CPython platform
 support".
 
@@ -454,7 +461,7 @@ Options for third-party dependencies
 .. option:: ZLIB_CFLAGS
 .. option:: ZLIB_LIBS
 
-   C compiler and linker flags for ``libzlib``, used by :mod:`gzip` module,
+   C compiler and linker flags for ``libzlib``, used by the :mod:`zlib` module,
    overriding ``pkg-config``.
 
 

Lib/test/support/__init__.py

@@ -493,12 +493,8 @@ def dec(*args, **kwargs):
     float.__getformat__("double").startswith("IEEE"),
     "test requires IEEE 754 doubles")
 
-def requires_zlib(reason='requires zlib'):
-    try:
-        import zlib
-    except ImportError:
-        zlib = None
-    return unittest.skipUnless(zlib, reason)
+def requires_zlib(reason):
+    return unittest.skipIf(sys.platform == "wasi", "zlib is unsupported on WASI")
 
 def requires_gzip(reason='requires gzip'):
     try: