From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 7 Sep 2016 02:55:55 +0000 (-0700)
Subject: Issue #27959: Updates NEWS and whatsnew
X-Git-Tag: v3.6.0b1~366
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6cebd48425ad9a3b325d9907c9a37cae04a788b9;p=thirdparty%2FPython%2Fcpython.git

Issue #27959: Updates NEWS and whatsnew
---

diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 0517ef8376fa..4cf77f9e2c83 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 f5e8aaa50f9a..f3b0acb14df9 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.