Commit 3ed3b3b4 authored by Ezio Melotti's avatar Ezio Melotti

#17714: merge with 3.3.

parents 7168879e c58a3ea7
...@@ -1194,7 +1194,9 @@ The following codecs provide bytes-to-bytes mappings. ...@@ -1194,7 +1194,9 @@ The following codecs provide bytes-to-bytes mappings.
| Codec | Aliases | Purpose | | Codec | Aliases | Purpose |
+====================+===========================+===========================+ +====================+===========================+===========================+
| base64_codec | base64, base-64 | Convert operand to MIME | | base64_codec | base64, base-64 | Convert operand to MIME |
| | | base64 | | | | base64 (the result always |
| | | includes a trailing |
| | | ``'\n'``) |
+--------------------+---------------------------+---------------------------+ +--------------------+---------------------------+---------------------------+
| bz2_codec | bz2 | Compress the operand | | bz2_codec | bz2 | Compress the operand |
| | | using bz2 | | | | using bz2 |
......
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