summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-09-07 02:55:55 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-09-07 02:55:55 (GMT)
commit6cebd48425ad9a3b325d9907c9a37cae04a788b9 (patch)
treee4c4d10199e1864bf29e7aba8d506971bf93f898
parent5a71327f35f80a7e874b971e55cbf5528c8d0c80 (diff)
downloadcpython-6cebd48425ad9a3b325d9907c9a37cae04a788b9.zip
cpython-6cebd48425ad9a3b325d9907c9a37cae04a788b9.tar.gz
cpython-6cebd48425ad9a3b325d9907c9a37cae04a788b9.tar.bz2
Issue #27959: Updates NEWS and whatsnew
-rw-r--r--Doc/whatsnew/3.6.rst6
-rw-r--r--Misc/NEWS3
2 files changed, 9 insertions, 0 deletions
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 0517ef8..4cf77f9 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -450,6 +450,12 @@ Any code relying on the presence of ``default_format`` may
need to be adapted. See :issue:`27819` for more details.
+encodings
+---------
+
+On Windows, added the ``'oem'`` encoding to use ``CP_OEMCP`` and the ``'ansi'``
+alias for the existing ``'mbcs'`` encoding, which uses the ``CP_ACP`` code page.
+
faulthandler
------------
diff --git a/Misc/NEWS b/Misc/NEWS
index f5e8aaa..f3b0acb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -237,6 +237,9 @@ Build
Windows
-------
+- Issue #27959: Adds oem encoding, alias ansi to mbcs, move aliasmbcs to
+ codec lookup.
+
- Issue #27982: The functions of the winsound module now accept keyword
arguments.