summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2017-03-03 15:07:18 (GMT)
committerGitHub <noreply@github.com>2017-03-03 15:07:18 (GMT)
commitc7ff163abf428d73d4054754db3c99d06487e3ad (patch)
treea150495fe14a9a46db21bcf95d1988eae547d5d3 /Doc/library
parent2adc66848135be8e86ba08690a858737a65ae40d (diff)
downloadcpython-c7ff163abf428d73d4054754db3c99d06487e3ad.zip
cpython-c7ff163abf428d73d4054754db3c99d06487e3ad.tar.gz
cpython-c7ff163abf428d73d4054754db3c99d06487e3ad.tar.bz2
Add Python version since deprecation in base64 methods. (#33) (#429)
Allow developers to not have to either test on N Python versions or looked through multiple versions of the docs to know whether they can easily update. (cherry picked from commit c643a967dd7d33ccefa5b61b38caf40b448057ce)
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/base64.rst17
1 files changed, 13 insertions, 4 deletions
diff --git a/Doc/library/base64.rst b/Doc/library/base64.rst
index 080d9d7..ceecf17 100644
--- a/Doc/library/base64.rst
+++ b/Doc/library/base64.rst
@@ -237,14 +237,18 @@ The legacy interface:
.. function:: decodebytes(s)
- decodestring(s)
Decode the :term:`bytes-like object` *s*, which must contain one or more
lines of base64 encoded data, and return the decoded :class:`bytes`.
- ``decodestring`` is a deprecated alias.
.. versionadded:: 3.1
+.. function:: decodestring(s)
+
+ Deprecated alias of :func:`decodebytes`.
+
+ .. deprecated:: 3.1
+
.. function:: encode(input, output)
@@ -257,14 +261,19 @@ The legacy interface:
.. function:: encodebytes(s)
- encodestring(s)
Encode the :term:`bytes-like object` *s*, which can contain arbitrary binary
data, and return :class:`bytes` containing the base64-encoded data, with newlines
(``b'\n'``) inserted after every 76 bytes of output, and ensuring that
there is a trailing newline, as per :rfc:`2045` (MIME).
- ``encodestring`` is a deprecated alias.
+ .. versionadded:: 3.1
+
+.. function:: encodestring(s)
+
+ Deprecated alias of :func:`encodebytes`.
+
+ .. deprecated:: 3.1
An example usage of the module: