Merge

.hgignore

@@ -87,6 +87,8 @@ PCbuild/Win32-temp-*
 PCbuild/x64-temp-*
 PCbuild/amd64
 PCbuild/ipch
+Tools/unicode/build/
+Tools/unicode/MAPPINGS/
 BuildLog.htm
 __pycache__
 Modules/_freeze_importlib

Lib/test/test_unicode.py

@@ -1831,7 +1831,7 @@ class UnicodeTest(string_tests.CommonTest,
         # 0-127
         s = bytes(range(128))
         for encoding in (
-            'cp037', 'cp1026',
+            'cp037', 'cp1026', 'cp273',
             'cp437', 'cp500', 'cp720', 'cp737', 'cp775', 'cp850',
             'cp852', 'cp855', 'cp858', 'cp860', 'cp861', 'cp862',
             'cp863', 'cp865', 'cp866',
@@ -1859,7 +1859,7 @@ class UnicodeTest(string_tests.CommonTest,
         # 128-255
         s = bytes(range(128, 256))
         for encoding in (
-            'cp037', 'cp1026',
+            'cp037', 'cp1026', 'cp273',
             'cp437', 'cp500', 'cp720', 'cp737', 'cp775', 'cp850',
             'cp852', 'cp855', 'cp858', 'cp860', 'cp861', 'cp862',
             'cp863', 'cp865', 'cp866',

Misc/NEWS

@@ -10,7 +10,7 @@ Projected release date: 2013-11-24
 Core and Builtins
 -----------------
 
-- Issue #19514: Deduplicate some _Py_IDENTIFIER declarations. 
+- Issue #19514: Deduplicate some _Py_IDENTIFIER declarations.
   Patch by Andrei Dorian Duma.
 
 - Issue #17936: Fix O(n**2) behaviour when adding or removing many subclasses
@@ -34,6 +34,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #1097797: Added CP273 encoding, used on IBM mainframes in
+  Germany and Austria.  Mapping provided by Michael Bierenfeld.
+
 - Issue #1575020: Fixed support of 24-bit wave files on big-endian platforms.
 
 - Issue #19378: Fixed a number of cases in the dis module where the new