[Python-checkins] python/dist/src/Lib/encodings __init__.py,1.12,1.13

[gvanrossum@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/encodings
In directory usw-pr-cvs1:/tmp/cvs-serv24937

Modified Files:
	__init__.py 
Log Message:
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.


Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/encodings/__init__.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** __init__.py	4 Oct 2002 11:45:38 -0000	1.12
--- __init__.py	4 Oct 2002 20:49:05 -0000	1.13
***************
*** 70,74 ****
      except ImportError:
          import aliases
!         modname = aliases.aliases.get(modname, modname)
          try:
              mod = __import__(modname, globals(), locals(), _import_tail)
--- 70,76 ----
      except ImportError:
          import aliases
!         modname = (aliases.aliases.get(modname) or
!                    aliases.aliases.get(modname.replace('.', '_')) or
!                    modname)
          try:
              mod = __import__(modname, globals(), locals(), _import_tail)