summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/logging/__init__.py2
-rw-r--r--Lib/test/test___all__.py1
-rw-r--r--Misc/NEWS3
3 files changed, 5 insertions, 1 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 2b8a021724..17d5220d04 100644
--- 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 0a8c5d652b..9cc37de711 100644
--- 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 ab14d9daeb..1400664e9c 100644
--- 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
==========================