From: Ashwin Ramaswami <aramaswamis@gmail.com>
Date: Wed, 5 Jun 2019 22:18:07 +0000 (-0700)
Subject: bpo-35551: encodings update (GH-11446)
X-Git-Tag: v3.9.0a1~1362
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4c15ed7a2c7c2a1983e88b89c244d121eb3e512;p=thirdparty%2FPython%2Fcpython.git

bpo-35551: encodings update (GH-11446)
---

diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 2e9314e0fab7..5048621bf0ad 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -1198,7 +1198,8 @@ particular, the following variants typically exist:
 +-----------------+--------------------------------+--------------------------------+
 | mac_iceland     | maciceland                     | Icelandic                      |
 +-----------------+--------------------------------+--------------------------------+
-| mac_latin2      | maclatin2, maccentraleurope    | Central and Eastern Europe     |
+| mac_latin2      | maclatin2, maccentraleurope,   | Central and Eastern Europe     |
+|                 | mac_centeuro                   |                                |
 +-----------------+--------------------------------+--------------------------------+
 | mac_roman       | macroman, macintosh            | Western Europe                 |
 +-----------------+--------------------------------+--------------------------------+
diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index 5ef40a3438b9..8b621add1b1b 100644
--- a/Lib/encodings/aliases.py
+++ b/Lib/encodings/aliases.py
@@ -448,6 +448,7 @@ aliases = {
 
     # mac_latin2 codec
     'maccentraleurope'   : 'mac_latin2',
+    'mac_centeuro'       : 'mac_latin2',
     'maclatin2'          : 'mac_latin2',
 
     # mac_roman codec
@@ -491,9 +492,6 @@ aliases = {
     'sjisx0213'          : 'shift_jisx0213',
     's_jisx0213'         : 'shift_jisx0213',
 
-    # tactis codec
-    'tis260'             : 'tactis',
-
     # tis_620 codec
     'tis620'             : 'tis_620',
     'tis_620_0'          : 'tis_620',
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-01-18-16-16-27.bpo-35551.oF5pbO.rst b/Misc/NEWS.d/next/Core and Builtins/2019-01-18-16-16-27.bpo-35551.oF5pbO.rst
new file mode 100644
index 000000000000..bd7946e6d947
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-01-18-16-16-27.bpo-35551.oF5pbO.rst	
@@ -0,0 +1,3 @@
+Updated encodings:
+- Removed the "tis260" encoding, which was an alias for the nonexistent "tactis" codec.
+- Added "mac_centeuro" as an alias for the mac_latin2 encoding.
\ No newline at end of file