diff options
| author | Martin Panter <vadmium> | 2015-09-12 01:22:17 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium> | 2015-09-12 01:22:17 (GMT) |
| commit | 9ab96946eef86d2fc0e54262ee7c44f3d5dc3d39 (patch) | |
| tree | 3b3abc3f73c2675e0e7fb700f23ea6704cdda4fb /Doc/library | |
| parent | 3133a9f5ab0eac7e21a13b9fa10356d6c830f83c (diff) | |
| parent | 06171bd52a02173910d7ab8082850bbed0db1410 (diff) | |
| download | cpython-9ab96946eef86d2fc0e54262ee7c44f3d5dc3d39.zip cpython-9ab96946eef86d2fc0e54262ee7c44f3d5dc3d39.tar.gz cpython-9ab96946eef86d2fc0e54262ee7c44f3d5dc3d39.tar.bz2 | |
Issue #16473: Merge codecs doc and test from 3.4 into 3.5
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/codecs.rst | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index dae556e..7438aec 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -1310,9 +1310,9 @@ to :class:`bytes` mappings. They are not supported by :meth:`bytes.decode` +----------------------+------------------+------------------------------+------------------------------+ | Codec | Aliases | Purpose | Encoder / decoder | +======================+==================+==============================+==============================+ -| base64_codec [#b64]_ | base64, base_64 | Convert operand to MIME | :meth:`base64.b64encode` / | -| | | base64 (the result always | :meth:`base64.b64decode` | -| | | includes a trailing | | +| base64_codec [#b64]_ | base64, base_64 | Convert operand to multiline | :meth:`base64.encodebytes` / | +| | | MIME base64 (the result | :meth:`base64.decodebytes` | +| | | always includes a trailing | | | | | ``'\n'``) | | | | | | | | | | .. versionchanged:: 3.4 | | @@ -1324,14 +1324,14 @@ to :class:`bytes` mappings. They are not supported by :meth:`bytes.decode` | bz2_codec | bz2 | Compress the operand | :meth:`bz2.compress` / | | | | using bz2 | :meth:`bz2.decompress` | +----------------------+------------------+------------------------------+------------------------------+ -| hex_codec | hex | Convert operand to | :meth:`base64.b16encode` / | -| | | hexadecimal | :meth:`base64.b16decode` | +| hex_codec | hex | Convert operand to | :meth:`binascii.b2a_hex` / | +| | | hexadecimal | :meth:`binascii.a2b_hex` | | | | representation, with two | | | | | digits per byte | | +----------------------+------------------+------------------------------+------------------------------+ -| quopri_codec | quopri, | Convert operand to MIME | :meth:`quopri.encodestring` /| -| | quotedprintable, | quoted printable | :meth:`quopri.decodestring` | -| | quoted_printable | | | +| quopri_codec | quopri, | Convert operand to MIME | :meth:`quopri.encode` with | +| | quotedprintable, | quoted printable | ``quotetabs=True`` / | +| | quoted_printable | | :meth:`quopri.decode` | +----------------------+------------------+------------------------------+------------------------------+ | uu_codec | uu | Convert the operand using | :meth:`uu.encode` / | | | | uuencode | :meth:`uu.decode` | |