Backport of 1.15:

Oops, must convert hyphens to underscores in keys of aliases dict.

diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index 64b94c466e459d0bbb6bef35ee8a4ae9a04a2c3e..e9a480074aff4aebd229336612eef6b628ef245e 100644 (file)
--- a/Lib/encodings/aliases.py
+++ b/Lib/encodings/aliases.py
@@ -36,7 +36,7 @@ aliases = {
     # ASCII
     'us_ascii': 'ascii',
     'ansi_x3.4_1968': 'ascii', # used on Linux
-    'ansi-x3-4-1968': 'ascii', # used on BSD?
+    'ansi_x3_4_1968': 'ascii', # used on BSD?
     '646': 'ascii',            # used on Solaris
 
     # EBCDIC