summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-09-07 02:46:42 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-09-07 02:46:42 (GMT)
commit5a71327f35f80a7e874b971e55cbf5528c8d0c80 (patch)
treec494d08ee6c19a1b47f0ae1851f0e9a19c77411c /Doc
parentf5aba58480bb0dd45181f609487ac2ecfcc98673 (diff)
downloadcpython-5a71327f35f80a7e874b971e55cbf5528c8d0c80.zip
cpython-5a71327f35f80a7e874b971e55cbf5528c8d0c80.tar.gz
cpython-5a71327f35f80a7e874b971e55cbf5528c8d0c80.tar.bz2
Issue #27959: Documents new encoding and alias.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/codecs.rst10
1 files changed, 8 insertions, 2 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 1add300..c6b6a56 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -1254,10 +1254,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`. |