summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2007-01-27 17:59:42 (GMT)
committerGeorg Brandl <georg@python.org>2007-01-27 17:59:42 (GMT)
commit4ba9e5bdc7213373dab9eb915fb459f7f5e06fb5 (patch)
tree9b5571d75dfd7cee5025eebe9637d9aab481933d
parentab49684f550ce6b12614b8a329f4d280e20e1277 (diff)
downloadcpython-4ba9e5bdc7213373dab9eb915fb459f7f5e06fb5.zip
cpython-4ba9e5bdc7213373dab9eb915fb459f7f5e06fb5.tar.gz
cpython-4ba9e5bdc7213373dab9eb915fb459f7f5e06fb5.tar.bz2
Patch #1634778: add missing encoding aliases for iso8859_15 and
iso8859_16.
-rw-r--r--Lib/email/charset.py3
-rw-r--r--Lib/encodings/aliases.py4
-rw-r--r--Misc/NEWS3
3 files changed, 10 insertions, 0 deletions
diff --git a/Lib/email/charset.py b/Lib/email/charset.py
index 8f218b2..d5ed3a8 100644
--- 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 681f9e3..cefb2ed 100644
--- 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 82c3d64..aef4218 100644
--- 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.