Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#17714: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-05-07 11:21:21 +03:00
parent 7168879eb2 c58a3ea72c
commit 3ed3b3b402
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/codecs.rst
View File

@ -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 |