summaryrefslogtreecommitdiffstats
path: root/Lib/encodings
diff options
context:
space:
mode:
authorMarc-André Lemburg <mal@egenix.com>2002-10-04 16:30:42 (GMT)
committerMarc-André Lemburg <mal@egenix.com>2002-10-04 16:30:42 (GMT)
commit8dc5ff2e5a37381c0ed9f166c82bfb09d865898c (patch)
tree2953de0a9861e8af18d82580df201269f509ea5c /Lib/encodings
parent68fc27385d93ca82ad34fa0ab8cd77576abbf4e1 (diff)
downloadcpython-8dc5ff2e5a37381c0ed9f166c82bfb09d865898c.zip
cpython-8dc5ff2e5a37381c0ed9f166c82bfb09d865898c.tar.gz
cpython-8dc5ff2e5a37381c0ed9f166c82bfb09d865898c.tar.bz2
Undo the removal. Guido mentioned that the encoding name is in active
by some email headers.
Diffstat (limited to 'Lib/encodings')
-rw-r--r--Lib/encodings/aliases.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index c1181eb..6620c2e 100644
--- a/Lib/encodings/aliases.py
+++ b/Lib/encodings/aliases.py
@@ -26,6 +26,7 @@ aliases = {
# ascii codec
'646' : 'ascii',
'ansi_x3.4_1968' : 'ascii',
+ 'ansi_x3_4_1968' : 'ascii', # some email headers use this non-standard name
'ansi_x3.4_1986' : 'ascii',
'cp367' : 'ascii',
'csascii' : 'ascii',