diff options
| author | R David Murray <rdmurray@bitdance.com> | 2015-12-13 23:11:07 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2015-12-13 23:11:07 (GMT) |
| commit | d991963a9d7d2cab962bd5fe7bdf6eeff903ed8a (patch) | |
| tree | 4a37b40ffccb1843e17da6b18518fdf9b58b1874 /Doc/library/binascii.rst | |
| parent | 6b8f0c892a075488fb6799bf5dbb9ed6743d31e2 (diff) | |
| parent | 51a4b22f9935f5419c7b32647369cd1b01373c74 (diff) | |
| download | cpython-d991963a9d7d2cab962bd5fe7bdf6eeff903ed8a.zip cpython-d991963a9d7d2cab962bd5fe7bdf6eeff903ed8a.tar.gz cpython-d991963a9d7d2cab962bd5fe7bdf6eeff903ed8a.tar.bz2 | |
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.
Diffstat (limited to 'Doc/library/binascii.rst')
| -rw-r--r-- | Doc/library/binascii.rst | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst index 0cd18b1..632ecf7 100644 --- a/Doc/library/binascii.rst +++ b/Doc/library/binascii.rst @@ -56,9 +56,7 @@ The :mod:`binascii` module defines the following functions: 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 @@ The :mod:`binascii` module defines the following functions: .. 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. |