python
diff --git a/‎Doc/library/base64.rst
Copy file name to clipboardExpand all lines: Doc/library/base64.rst
-12Lines changed: 0 additions & 12 deletions b/‎Doc/library/base64.rst
Copy file name to clipboardExpand all lines: Doc/library/base64.rst
-12Lines changed: 0 additions & 12 deletions
diff --git a/‎Doc/whatsnew/3.9.rst
Copy file name to clipboardExpand all lines: Doc/whatsnew/3.9.rst
+5Lines changed: 5 additions & 0 deletions b/‎Doc/whatsnew/3.9.rst
Copy file name to clipboardExpand all lines: Doc/whatsnew/3.9.rst
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎Lib/base64.py
Copy file name to clipboardExpand all lines: Lib/base64.py
-16Lines changed: 0 additions & 16 deletions b/‎Lib/base64.py
Copy file name to clipboardExpand all lines: Lib/base64.py
-16Lines changed: 0 additions & 16 deletions
diff --git a/‎Lib/test/test_base64.py
Copy file name to clipboardExpand all lines: Lib/test/test_base64.py
-8Lines changed: 0 additions & 8 deletions b/‎Lib/test/test_base64.py
Copy file name to clipboardExpand all lines: Lib/test/test_base64.py
-8Lines changed: 0 additions & 8 deletions
diff --git a/‎Misc/NEWS.d/next/Library/2020-01-16-09-27-28.bpo-39351.a-FQdv.rst
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎Misc/NEWS.d/next/Library/2020-01-16-09-27-28.bpo-39351.a-FQdv.rst
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
@@ -235,12 +235,6 @@ The legacy interface:
 
    .. versionadded:: 3.1
 
-.. function:: decodestring(s)
-
-   Deprecated alias of :func:`decodebytes`.
-
-   .. deprecated:: 3.1
-
 
 .. function:: encode(input, output)
 
@@ -261,12 +255,6 @@ The legacy interface:
 
    .. versionadded:: 3.1
 
-.. function:: encodestring(s)
-
-   Deprecated alias of :func:`encodebytes`.
-
-   .. deprecated:: 3.1
-
 
 An example usage of the module:
 
 
@@ -411,6 +411,11 @@ Removed
   of :pep:`442`. Patch by Joannah Nanjekye.
   (Contributed by Joannah Nanjekye in :issue:`15088`)
 
+* ``base64.encodestring()`` and ``base64.decodestring()``, aliases deprecated
+  since Python 3.1, have been removed: use :func:`base64.encodebytes` and
+  :func:`base64.decodebytes` instead.
+  (Contributed by Victor Stinner in :issue:`39351`.)
+
 
 Porting to Python 3.9
 =====================
 
@@ -531,28 +531,12 @@ def encodebytes(s):
         pieces.append(binascii.b2a_base64(chunk))
     return b"".join(pieces)
 
-def encodestring(s):
-    """Legacy alias of encodebytes()."""
-    import warnings
-    warnings.warn("encodestring() is a deprecated alias since 3.1, "
-                  "use encodebytes()",
-                  DeprecationWarning, 2)
-    return encodebytes(s)
-
 
 def decodebytes(s):
     """Decode a bytestring of base-64 data into a bytes object."""
     _input_type_check(s)
     return binascii.a2b_base64(s)
 
-def decodestring(s):
-    """Legacy alias of decodebytes()."""
-    import warnings
-    warnings.warn("decodestring() is a deprecated alias since Python 3.1, "
-                  "use decodebytes()",
-                  DeprecationWarning, 2)
-    return decodebytes(s)
-
 
 # Usable as a script...
 def main():
 
@@ -18,14 +18,6 @@ def check_type_errors(self, f):
         int_data = memoryview(b"1234").cast('I')
         self.assertRaises(TypeError, f, int_data)
 
-    def test_encodestring_warns(self):
-        with self.assertWarns(DeprecationWarning):
-            base64.encodestring(b"www.python.org")
-
-    def test_decodestring_warns(self):
-        with self.assertWarns(DeprecationWarning):
-            base64.decodestring(b"d3d3LnB5dGhvbi5vcmc=\n")
-
     def test_encodebytes(self):
         eq = self.assertEqual
         eq(base64.encodebytes(b"www.python.org"), b"d3d3LnB5dGhvbi5vcmc=\n")
 
@@ -0,0 +1,3 @@
+Remove ``base64.encodestring()`` and ``base64.decodestring()``, aliases
+deprecated since Python 3.1: use :func:`base64.encodebytes` and
+:func:`base64.decodebytes` instead.