#7052: remove nonexisting NullHandler from logging.__all__.

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 2b8a02172405d65a233c1f1e08af144dbf16fe4d..17d5220d0402189c800b0dd5c8bec4747a71c267 100644 (file)
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -25,7 +25,7 @@ To use, simply 'import logging' and log away!
 
 __all__ = ['BASIC_FORMAT', 'BufferingFormatter', 'CRITICAL', 'DEBUG', 'ERROR',
            'FATAL', 'FileHandler', 'Filter', 'Formatter', 'Handler', 'INFO',
-           'LogRecord', 'Logger', 'LoggerAdapter', 'NOTSET', 'NullHandler',
+           'LogRecord', 'Logger', 'LoggerAdapter', 'NOTSET',
            'StreamHandler', 'WARN', 'WARNING', 'addLevelName', 'basicConfig',
            'captureWarnings', 'critical', 'debug', 'disable', 'error',
            'exception', 'fatal', 'getLevelName', 'getLogger', 'getLoggerClass',

diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 0a8c5d652bf045bb148b3018f8878f0f173551fc..9cc37de71158243123a839843ae9472e83e6291c 100644 (file)
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -91,6 +91,7 @@ class AllTest(unittest.TestCase):
         self.check_all("keyword")
         self.check_all("linecache")
         self.check_all("locale")
+        self.check_all("logging")
         self.check_all("macpath")
         self.check_all("macurl2path")
         self.check_all("mailbox")

diff --git a/Misc/NEWS b/Misc/NEWS
index ab14d9daebb38c207976a3787abce7cf8cd46ac0..1400664e9ce8abc00649305e6e0900e9c9213ffa 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,9 +18,12 @@ Core and Builtins
 Library
 -------
 
+- Issue #7052: Removed nonexisting NullHandler from logging.__all__.
+
 - Issue #7039: Fixed distutils.tests.test_sysconfig when running on
   installation with no build.
 
+
 What's New in Python 2.6.3
 ==========================