diff options
| author | doko <doko@ubuntu.com> | 2017-01-31 13:35:26 +0100 |
|---|---|---|
| committer | doko <doko@ubuntu.com> | 2017-01-31 13:35:26 +0100 |
| commit | e0cb38ac4330d5e09b5e21c74c5d5e453af99a4f (patch) | |
| tree | a64fe56edb37bb84d4ffea1990c0ac124a6dba9d /Doc/library/codecs.rst | |
| parent | d7764ed2a9255ddb5bdb7d3f184610cdc7a66aad (diff) | |
| parent | 602663ac0effc2e8e3b615141babd95ed7691dda (diff) | |
| download | cpython-e0cb38ac4330d5e09b5e21c74c5d5e453af99a4f.tar.gz | |
merge 3.5
Diffstat (limited to 'Doc/library/codecs.rst')
| -rw-r--r-- | Doc/library/codecs.rst | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index f38e41bff5..0ecd89ba75 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -1263,10 +1263,16 @@ encodings. | | | Only ``errors='strict'`` | | | | is supported. | +--------------------+---------+---------------------------+ -| mbcs | dbcs | Windows only: Encode | -| | | operand according to the | +| mbcs | ansi, | Windows only: Encode | +| | dbcs | operand according to the | | | | ANSI codepage (CP_ACP) | +--------------------+---------+---------------------------+ +| oem | | Windows only: Encode | +| | | operand according to the | +| | | OEM codepage (CP_OEMCP) | +| | | | +| | | .. versionadded:: 3.6 | ++--------------------+---------+---------------------------+ | palmos | | Encoding of PalmOS 3.5 | +--------------------+---------+---------------------------+ | punycode | | Implements :rfc:`3492`. | |