From: Georg Brandl <georg@python.org>
Date: Sat, 30 Sep 2006 14:48:03 +0000 (+0000)
Subject: Back out r52076, it's causing the buildbots to fail because of test_charmapcodec.
X-Git-Tag: v2.4.4c1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b32cdd2b232e82defc7e9e2231be29bb43b732a;p=thirdparty%2FPython%2Fcpython.git

Back out r52076, it's causing the buildbots to fail because of test_charmapcodec.
---

diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py
index cdcfbe0bd045..d2e952343fa4 100644
--- a/Lib/encodings/__init__.py
+++ b/Lib/encodings/__init__.py
@@ -89,7 +89,7 @@ def search_function(encoding):
     else:
         modnames = [norm_encoding]
     for modname in modnames:
-        if not modname or '.' in modname:
+        if not modname:
             continue
         try:
             mod = __import__(modname,
diff --git a/Misc/NEWS b/Misc/NEWS
index ca2ac00605f2..69d75604a79c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -122,9 +122,6 @@ Extension Modules
 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.