pythongh-104773: PEP 594: Remove the nis module (python#104897)

blhsing · May 24, 2023 · 17e1fe0 · 17e1fe0
1 parent b1cb30e
commit 17e1fe0
Show file tree

Hide file tree

Showing 21 changed files with 13 additions and 1,023 deletions.
diff --git a/Doc/library/nis.rst b/Doc/library/nis.rst
diff --git a/Doc/library/superseded.rst b/Doc/library/superseded.rst
@@ -16,7 +16,6 @@ backwards compatibility. They have been superseded by other modules.
    crypt.rst
    imghdr.rst
    msilib.rst
-   nis.rst
    optparse.rst
    uu.rst
    xdrlib.rst
diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst
@@ -1426,9 +1426,9 @@ complete list of changes, or look through the SVN logs for all the details.
   :file:`.msi` files and CAB files.  Some support for reading the :file:`.msi`
   database is also included. (Contributed by Martin von Löwis.)
 
-* The :mod:`nis` module now supports accessing domains other than the system
-  default domain by supplying a *domain* argument to the :func:`nis.match` and
-  :func:`nis.maps` functions. (Contributed by Ben Bell.)
+* The :mod:`!nis` module now supports accessing domains other than the system
+  default domain by supplying a *domain* argument to the :func:`!nis.match` and
+  :func:`!nis.maps` functions. (Contributed by Ben Bell.)
 
 * The :mod:`operator` module's :func:`itemgetter`  and :func:`attrgetter`
   functions now support multiple fields.   A call such as

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
@@ -1733,7 +1733,7 @@ Modules
   +---------------------+---------------------+---------------------+---------------------+---------------------+
   | :mod:`aifc`         | :mod:`chunk`        | :mod:`msilib`       | :mod:`!pipes`       | :mod:`!telnetlib`   |
   +---------------------+---------------------+---------------------+---------------------+---------------------+
-  | :mod:`audioop`      | :mod:`crypt`        | :mod:`nis`          | :mod:`!sndhdr`      | :mod:`uu`           |
+  | :mod:`audioop`      | :mod:`crypt`        | :mod:`!nis`         | :mod:`!sndhdr`      | :mod:`uu`           |
   +---------------------+---------------------+---------------------+---------------------+---------------------+
   | :mod:`!cgi`         | :mod:`imghdr`       | :mod:`!nntplib`     | :mod:`!spwd`        | :mod:`xdrlib`       |
   +---------------------+---------------------+---------------------+---------------------+---------------------+

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
@@ -895,7 +895,7 @@ Modules (see :pep:`594`):
 * :mod:`imghdr`
 * :mod:`!mailcap`
 * :mod:`msilib`
-* :mod:`nis`
+* :mod:`!nis`
 * :mod:`!nntplib`
 * :mod:`!ossaudiodev`
 * :mod:`!pipes`

diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
@@ -192,6 +192,9 @@ Removed
   instead.
   (Contributed by Victor Stinner in :gh:`104773`.)
 
+* :pep:`594`: Remove the :mod:`!nis` module, deprecated in Python 3.11.
+  (Contributed by Victor Stinner in :gh:`104773`.)
+
 
 Porting to Python 3.13
 ======================

diff --git a/Lib/test/test_nis.py b/Lib/test/test_nis.py
diff --git a/Misc/NEWS.d/3.10.0a1.rst b/Misc/NEWS.d/3.10.0a1.rst
@@ -714,7 +714,7 @@ Fix refleak in _Py_fopen_obj() when PySys_Audit() fails
 .. nonce: tzMy7m
 .. section: Core and Builtins
 
-Add a state to the :mod:`nis` module (:pep:`3121`) and apply the multiphase
+Add a state to the :mod:`!nis` module (:pep:`3121`) and apply the multiphase
 initialization. Patch by Dong-hee Na.
 
 ..

diff --git a/Misc/NEWS.d/next/Library/2023-05-24-23-40-22.gh-issue-104773.FHA99J.rst b/Misc/NEWS.d/next/Library/2023-05-24-23-40-22.gh-issue-104773.FHA99J.rst
@@ -0,0 +1,2 @@
+:pep:`594`: Remove the :mod:`!nis` module, deprecated in Python 3.11. Patch
+by Victor Stinner.
diff --git a/Modules/Setup b/Modules/Setup
@@ -191,7 +191,6 @@ PYTHONPATH=$(COREPYTHONPATH)
 # Modules with UNIX dependencies that require external libraries
 
 #_crypt _cryptmodule.c -lcrypt
-#nis nismodule.c -I/usr/include/tirpc -lnsl -ltirpc
 
 # Modules that require external libraries.
 

diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
@@ -111,9 +111,6 @@
 @MODULE_FCNTL_TRUE@fcntl fcntlmodule.c
 @MODULE_GRP_TRUE@grp grpmodule.c
 @MODULE_MMAP_TRUE@mmap mmapmodule.c
-# FreeBSD: nis/yp APIs are in libc
-# Linux: glibc has deprecated SUN RPC, APIs are in libnsl and libtirpc (bpo-32521)
-@MODULE_NIS_TRUE@nis nismodule.c
 # needs sys/soundcard.h or linux/soundcard.h (Linux, FreeBSD)
 @MODULE__POSIXSUBPROCESS_TRUE@_posixsubprocess _posixsubprocess.c
 @MODULE_RESOURCE_TRUE@resource resource.c