Skip to content

C
cpython
Commit 9b149b94 authored by Ezio Melotti's avatar Ezio Melotti
Browse files
Options

#17841: merge with 3.3.

parents 40e39fc8 173d4109
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
Doc/library/codecs.rst
View file @ 9b149b94
...@@ -1188,44 +1188,44 @@ particular, the following variants typically exist: ...@@ -1188,44 +1188,44 @@ particular, the following variants typically exist:
The following codecs provide bytes-to-bytes mappings. The following codecs provide bytes-to-bytes mappings.
.. tabularcolumns:: |l|p{0.3\linewidth}|p{0.3\linewidth}| .. tabularcolumns:: |l|L|
+--------------------+---------------------------+---------------------------+ +--------------------+---------------------------+
| Codec | Aliases | Purpose | | Codec | Purpose |
+====================+===========================+===========================+ +====================+===========================+
| base64_codec | base64, base-64 | Convert operand to MIME | | base64_codec | Convert operand to MIME |
| | | base64 (the result always | | | base64 (the result always |
| | | includes a trailing | | | includes a trailing |
| | | ``'\n'``) | | | ``'\n'``) |
+--------------------+---------------------------+---------------------------+ +--------------------+---------------------------+
| bz2_codec | bz2 | Compress the operand | | bz2_codec | Compress the operand |
| | | using bz2 | | | using bz2 |
+--------------------+---------------------------+---------------------------+ +--------------------+---------------------------+
| hex_codec | hex | Convert operand to | | hex_codec | Convert operand to |
| | | hexadecimal | | | hexadecimal |
| | | representation, with two | | | representation, with two |
| | | digits per byte | | | digits per byte |
+--------------------+---------------------------+---------------------------+ +--------------------+---------------------------+
| quopri_codec | quopri, quoted-printable, | Convert operand to MIME | | quopri_codec | Convert operand to MIME |
| | quotedprintable | quoted printable | | | quoted printable |
+--------------------+---------------------------+---------------------------+ +--------------------+---------------------------+
| uu_codec | uu | Convert the operand using | | uu_codec | Convert the operand using |
| | | uuencode | | | uuencode |
+--------------------+---------------------------+---------------------------+ +--------------------+---------------------------+
| zlib_codec | zip, zlib | Compress the operand | | zlib_codec | Compress the operand |
| | | using gzip | | | using gzip |
+--------------------+---------------------------+---------------------------+ +--------------------+---------------------------+
The following codecs provide string-to-string mappings. The following codecs provide string-to-string mappings.
.. tabularcolumns:: |l|p{0.3\linewidth}|p{0.3\linewidth}| .. tabularcolumns:: |l|L|
+--------------------+---------------------------+---------------------------+ +--------------------+---------------------------+
| Codec | Aliases | Purpose | | Codec | Purpose |
+====================+===========================+===========================+ +====================+===========================+
| rot_13 | rot13 | Returns the Caesar-cypher | | rot_13 | Returns the Caesar-cypher |
| | | encryption of the operand | | | encryption of the operand |
+--------------------+---------------------------+---------------------------+ +--------------------+---------------------------+
.. versionadded:: 3.2 .. versionadded:: 3.2
bytes-to-bytes and string-to-string codecs. bytes-to-bytes and string-to-string codecs.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7