* Issue #16113: Remove sha3 module again.

Patch by Christian Heimes, with modifications.

3 files changed, 1 insertions, 32 deletions

diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index ee99178..8f4cd70 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -60,13 +60,9 @@ concatenation of the data fed to it so far using the :meth:`digest` or
 
 Constructors for hash algorithms that are always present in this module are
 :func:`md5`, :func:`sha1`, :func:`sha224`, :func:`sha256`, :func:`sha384`,
-:func:`sha512`, :func:`sha3_224`, :func:`sha3_256`, :func:`sha3_384`, and
-:func:`sha3_512`. Additional algorithms may also be available depending upon
+and :func:`sha512`. Additional algorithms may also be available depending upon
 the OpenSSL library that Python uses on your platform.
 
-   .. versionchanged:: 3.4
-      Added sha3 family of hash algorithms.
-
 For example, to obtain the digest of the byte string ``b'Nobody inspects the
 spammish repetition'``::
 
diff --git a/Doc/license.rst b/Doc/license.rst
index 29d4283..08e5464 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -590,25 +590,6 @@ The :mod:`select` and contains the following notice for the kqueue interface::
   SUCH DAMAGE.
 
 
-SHA-3
------
-
-The module :mod:`_sha3` and :mod:`hashlib` are using the reference
-implementation of Keccak. The files at :file:`Modules/_sha3/keccak/` contain
-the following note::
-
-  The Keccak sponge function, designed by Guido Bertoni, Joan Daemen,
-  Michaël Peeters and Gilles Van Assche. For more information, feedback or
-  questions, please refer to our website: http://keccak.noekeon.org/
-
-  Implementation by the designers,
-  hereby denoted as "the implementer".
-
-  To the extent possible under law, the implementer has waived all copyright
-  and related or neighboring rights to the source code in this file.
-  http://creativecommons.org/publicdomain/zero/1.0/
-
-
 SipHash24
 ---------
 
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index fe19ae7..7d7c2b3 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -123,8 +123,6 @@ Significantly Improved Library Modules:
 * :ref:`Single-dispatch generic functions <whatsnew-singledispatch>` in
   :mod:`functools` (:pep:`443`).
 * New :mod:`pickle` :ref:`protocol 4 <whatsnew-protocol-4>` (:pep:`3154`).
-* :ref:`SHA-3 (Keccak) support <whatsnew-sha3>` for :mod:`hashlib`
-  (:issue:`16113`).
 * :ref:`TLSv1.1 and TLSv1.2 support <whatsnew-tls-11-12>` for :mod:`ssl`
   (:issue:`16692`).
 * :mod:`multiprocessing` now has :ref:`an option to avoid using os.fork
@@ -667,12 +665,6 @@ hashlib
 New :func:`hashlib.pbkdf2_hmac` function.
 (Contributed by Christian Heimes in :issue:`18582`)
 
-.. _whatsnew-sha3:
-
-New :ref:`hash algorithms <hash-algorithms>` ``sha3_224()``, ``sha3_256()``,
-``sha3_384()``, and ``sha3_512()``.  (Contributed by Christian Heimes in
-:issue:`16113`.)
-
 
 html
 ----