Patch #1634778: add missing encoding aliases for iso8859_15 and

iso8859_16.

diff --git a/Lib/email/charset.py b/Lib/email/charset.py
index 8f218b2095b7763387fd64b1c31959f5213e96ff..d5ed3a83f9e9c42ef2a7826249bdc678f9d8682b 100644 (file)
--- a/Lib/email/charset.py
+++ b/Lib/email/charset.py
@@ -46,6 +46,7 @@ CHARSETS = {
     'iso-8859-13': (QP,        QP,      None),
     'iso-8859-14': (QP,        QP,      None),
     'iso-8859-15': (QP,        QP,      None),
+    'iso-8859-16': (QP,        QP,      None),
     'windows-1252':(QP,        QP,      None),
     'viscii':      (QP,        QP,      None),
     'us-ascii':    (None,      None,    None),
@@ -81,6 +82,8 @@ ALIASES = {
     'latin-8': 'iso-8859-14',
     'latin_9': 'iso-8859-15',
     'latin-9': 'iso-8859-15',
+    'latin_10':'iso-8859-16',
+    'latin-10':'iso-8859-16',
     'cp949':   'ks_c_5601-1987',
     'euc_jp':  'euc-jp',
     'euc_kr':  'euc-kr',

diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index 681f9e356caf8ade37dafe0bae50b64c771e2e95..cefb2edc2db521e82b3515d656c419bfdd306430 100644 (file)
--- a/Lib/encodings/aliases.py
+++ b/Lib/encodings/aliases.py
@@ -301,6 +301,8 @@ aliases = {
 
     # iso8859_13 codec
     'iso_8859_13'        : 'iso8859_13',
+    'l7'                 : 'iso8859_13',
+    'latin7'             : 'iso8859_13',
 
     # iso8859_14 codec
     'iso_8859_14'        : 'iso8859_14',
@@ -312,6 +314,8 @@ aliases = {
 
     # iso8859_15 codec
     'iso_8859_15'        : 'iso8859_15',
+    'l9'                 : 'iso8859_15',
+    'latin9'             : 'iso8859_15',
 
     # iso8859_16 codec
     'iso_8859_16'        : 'iso8859_16',

diff --git a/Misc/NEWS b/Misc/NEWS
index 82c3d64a890cd46b4ac334a37b58ef9647a1cf0c..aef42180a332c0d39c3db09f51c8db31d460c7e4 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,9 @@ Core and builtins
 Library
 -------
 
+- Patch #1634778: add missing encoding aliases for iso8859_15 and
+  iso8859_16.
+
 - Patch #1638243: the compiler package is now able to correctly compile
   a with statement; previously, executing code containing a with statement
   compiled by the compiler package crashed the interpreter.