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 cdcfbe0bd045e5a9aaa0ac0414b1d98267e050be..d2e952343fa4e994a1ca0e873285abcd87251dac 100644 (file)
--- 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 ca2ac00605f2a19207a87b20964871f9082b1f96..69d75604a79c144a3c98e27d0551216cc8b2f73c 100644 (file)
--- 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.