cpython: b3e1be1493a5 (original) (raw)
Mercurial > cpython
changeset 83669:b3e1be1493a5
#17714: merge with 3.3. [#17714]
| Ezio Melotti ezio.melotti@gmail.com | |
|---|---|
| date | Tue, 07 May 2013 11:21:21 +0300 |
| parents | 15ed67602ddf(current diff)cbb23e40e0d7(diff) |
| children | 15fd07c89941 |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-)[+] [-] Doc/library/codecs.rst 4 |
line wrap: on
line diff
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -1194,7 +1194,9 @@ The following codecs provide bytes-to-by
| 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 |