summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAshwin Ramaswami <aramaswamis@gmail.com>2019-06-05 22:18:07 (GMT)
committerCheryl Sabella <cheryl.sabella@gmail.com>2019-06-05 22:18:06 (GMT)
commitc4c15ed7a2c7c2a1983e88b89c244d121eb3e512 (patch)
tree9e1363c4b568a937b82402c996765ee2260a5db7
parent54edb04aa688c8247570b4f59b5145e3fa417576 (diff)
downloadcpython-c4c15ed7a2c7c2a1983e88b89c244d121eb3e512.zip
cpython-c4c15ed7a2c7c2a1983e88b89c244d121eb3e512.tar.gz
cpython-c4c15ed7a2c7c2a1983e88b89c244d121eb3e512.tar.bz2
bpo-35551: encodings update (GH-11446)
-rw-r--r--Doc/library/codecs.rst3
-rw-r--r--Lib/encodings/aliases.py4
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2019-01-18-16-16-27.bpo-35551.oF5pbO.rst3
3 files changed, 6 insertions, 4 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 2e9314e..5048621 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 5ef40a3..8b621ad 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 0000000..bd7946e
--- /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