[Python-checkins] cpython (merge 3.5 -> default): Merge: #25495: Clarify b2a_base64 documentation vis 57 bytes.

[r.david.murray]

https://hg.python.org/cpython/rev/35650db28afe
changeset:   99558:35650db28afe
parent:      99553:e373ec3c2969
parent:      99557:ea9951598bab
user:        R David Murray <rdmurray at bitdance.com>
date:        Sun Dec 13 18:11:07 2015 -0500
summary:
  Merge: #25495: Clarify b2a_base64 documentation vis 57 bytes.

In 3.6 the parameter to control the appending of the newline was finally
added, so I dropped the historical note about why a new line was always
appended.

files:
  Doc/library/binascii.rst |  7 +++----
  1 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst
--- a/Doc/library/binascii.rst
+++ b/Doc/library/binascii.rst
@@ -56,9 +56,7 @@
 
    Convert binary data to a line of ASCII characters in base64 coding. The return
    value is the converted line, including a newline char if *newline* is
-   true. The length of *data* should be at most 57 to adhere to the
-   base64 standard.
-
+   true.  The output of this function conforms to :rfc:`3548`.
 
    .. versionchanged:: 3.6
       Added the *newline* parameter.
@@ -172,7 +170,8 @@
 .. seealso::
 
    Module :mod:`base64`
-      Support for base64 encoding used in MIME email messages.
+      Support for RFC compliant base64-style encoding in base 16, 32, 64,
+      and 85.
 
    Module :mod:`binhex`
       Support for the binhex format used on the Macintosh.

-- 
Repository URL: https://hg.python.org/cpython