diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-05-07 08:21:21 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-05-07 08:21:21 (GMT) |
| commit | 3ed3b3b402806cf857df7d98853efe1bc0828d85 (patch) | |
| tree | 66b8577de3f7643f49578c2e56ed37c63744eb08 /Doc | |
| parent | 7168879eb247545944568dc38fcc9c26a5e5ca30 (diff) | |
| parent | c58a3ea72c6dd315e6a3a283168832fb06b8e69d (diff) | |
| download | cpython-3ed3b3b402806cf857df7d98853efe1bc0828d85.zip cpython-3ed3b3b402806cf857df7d98853efe1bc0828d85.tar.gz cpython-3ed3b3b402806cf857df7d98853efe1bc0828d85.tar.bz2 | |
#17714: merge with 3.3.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/codecs.rst | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index 9e1a9c7..87c2b39 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -1194,7 +1194,9 @@ The following codecs provide bytes-to-bytes mappings. | Codec | Aliases | Purpose | +====================+===========================+===========================+ | base64_codec | base64, base-64 | Convert operand to MIME | -| | | base64 | +| | | base64 (the result always | +| | | includes a trailing | +| | | ``'\n'``) | +--------------------+---------------------------+---------------------------+ | bz2_codec | bz2 | Compress the operand | | | | using bz2 | |