From c4c15ed7a2c7c2a1983e88b89c244d121eb3e512 Mon Sep 17 00:00:00 2001 From: Ashwin Ramaswami Date: Wed, 5 Jun 2019 15:18:07 -0700 Subject: [PATCH] bpo-35551: encodings update (GH-11446) --- Doc/library/codecs.rst | 3 ++- Lib/encodings/aliases.py | 4 +--- .../2019-01-18-16-16-27.bpo-35551.oF5pbO.rst | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2019-01-18-16-16-27.bpo-35551.oF5pbO.rst diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index 2e9314e0fab..5048621bf0a 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 5ef40a3438b..8b621add1b1 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 00000000000..bd7946e6d94 --- /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