From: Marc-André Lemburg <mal@egenix.com>
Date: Fri, 4 Oct 2002 16:30:42 +0000 (+0000)
Subject: Undo the removal. Guido mentioned that the encoding name is in active
X-Git-Tag: v2.3c1~3885
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8dc5ff2e5a37381c0ed9f166c82bfb09d865898c;p=thirdparty%2FPython%2Fcpython.git

Undo the removal. Guido mentioned that the encoding name is in active
by some email headers.
---

diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index c1181eb6c89d..6620c2e4f462 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',