When looking for an alias, first look for the normalized name (which

still may contain dots), then if that doesn't exist look for the name
with dots replaced by underscores.  This is a little more forgiving.

diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py
index b928976131f88c2806038ea0905da8fca11e29a9..b2542b8bd745e207783af49ba19545bdbedb0ced 100644 (file)
--- a/Lib/encodings/__init__.py
+++ b/Lib/encodings/__init__.py
@@ -69,7 +69,9 @@ def search_function(encoding):
                          globals(), locals(), _import_tail)
     except ImportError:
         import aliases
-        modname = aliases.aliases.get(modname, modname)
+        modname = (aliases.aliases.get(modname) or
+                   aliases.aliases.get(modname.replace('.', '_')) or
+                   modname)
         try:
             mod = __import__(modname, globals(), locals(), _import_tail)
         except ImportError: