[Python-checkins] r52077 - in python/branches/release25-maint: Lib/encodings/__init__.py Misc/NEWS

[georg.brandl]

Author: georg.brandl
Date: Sat Sep 30 13:22:35 2006
New Revision: 52077

Modified:
   python/branches/release25-maint/Lib/encodings/__init__.py
   python/branches/release25-maint/Misc/NEWS
Log:
Bug #1446043: correctly raise a LookupError if an encoding name given
to encodings.search_function() contains a dot.
 (backport from rev. 52075)

Modified: python/branches/release25-maint/Lib/encodings/__init__.py
==============================================================================
--- python/branches/release25-maint/Lib/encodings/__init__.py	(original)
+++ python/branches/release25-maint/Lib/encodings/__init__.py	Sat Sep 30 13:22:35 2006
@@ -90,7 +90,7 @@
     else:
         modnames = [norm_encoding]
     for modname in modnames:
-        if not modname:
+        if not modname or '.' in modname:
             continue
         try:
             mod = __import__('encodings.' + modname,

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Sat Sep 30 13:22:35 2006
@@ -44,6 +44,9 @@
 Library
 -------
 
+- Bug #1446043: correctly raise a LookupError if an encoding name given
+  to encodings.search_function() contains a dot.
+
 - Bug #1560617: in pyclbr, return full module name not only for classes,
   but also for functions.