From: Guido van Rossum <guido@python.org>
Date: Fri, 4 Oct 2002 20:49:05 +0000 (+0000)
Subject: When looking for an alias, first look for the normalized name (which
X-Git-Tag: v2.3c1~3881
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8c6065231d4595a28fe54d3b8f54cb3d222e537;p=thirdparty%2FPython%2Fcpython.git

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 b928976131f8..b2542b8bd745 100644
--- 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: