Skip to content

Commit 21be51f

Browse files
Reuse
1 parent 5beb870 commit 21be51f

File tree

2 files changed

+29
-7
lines changed

2 files changed

+29
-7
lines changed

Lib/email/charset.py

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
from email import errors
1818
from email.encoders import encode_7or8bit
19-
from encodings.aliases import aliases as ALIASES
2019

2120

2221
# Flags for types of header encodings
@@ -62,11 +61,35 @@
6261
'utf-8': (SHORTEST, BASE64, 'utf-8'),
6362
}
6463

65-
# The email module uses the slower latin-1 encoding
66-
ALIASES.update({
67-
'latin-1': 'iso-8859-1',
64+
# Aliases for other commonly-used names for character sets. Map
65+
# them to the real ones used in email.
66+
ALIASES = {
6867
'latin_1': 'iso-8859-1',
69-
})
68+
'latin-1': 'iso-8859-1',
69+
'latin_2': 'iso-8859-2',
70+
'latin-2': 'iso-8859-2',
71+
'latin_3': 'iso-8859-3',
72+
'latin-3': 'iso-8859-3',
73+
'latin_4': 'iso-8859-4',
74+
'latin-4': 'iso-8859-4',
75+
'latin_5': 'iso-8859-9',
76+
'latin-5': 'iso-8859-9',
77+
'latin_6': 'iso-8859-10',
78+
'latin-6': 'iso-8859-10',
79+
'latin_7': 'iso-8859-13',
80+
'latin-7': 'iso-8859-13',
81+
'latin_8': 'iso-8859-14',
82+
'latin-8': 'iso-8859-14',
83+
'latin_9': 'iso-8859-15',
84+
'latin-9': 'iso-8859-15',
85+
'latin_10':'iso-8859-16',
86+
'latin-10':'iso-8859-16',
87+
'cp949': 'ks_c_5601-1987',
88+
'euc_jp': 'euc-jp',
89+
'euc_kr': 'euc-kr',
90+
'ascii': 'us-ascii',
91+
}
92+
7093

7194
# Map charsets to their Unicode codec strings.
7295
CODEC_MAP = {
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
:mod:`email`: Use :mod:`!encodings.aliases` for alias lookup
2-
:mod:`!encodings.aliases`: Add ``latin_*`` aliases.
1+
:mod:`!encodings.aliases`: Add ``latin_N`` aliases

0 commit comments

Comments
 (0)