Fix missing import of the types module in logging.config.

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 5ea0d15b64f2fd1e4db9cadf4f0b66785ed39819..f14eb122b7c7dae04158716d77ceca614ff0f242 100644 (file)
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -27,7 +27,7 @@ Copyright (C) 2001-2004 Vinay Sajip. All Rights Reserved.
 To use, simply 'import logging' and log away!
 """
 
-import sys, logging, logging.handlers, string, socket, struct, os, traceback
+import sys, logging, logging.handlers, string, socket, struct, os, traceback, types
 
 try:
     import thread

diff --git a/Misc/NEWS b/Misc/NEWS
index 43e6a376dea880dcf0f2b5db0386e545b79b64c4..172d087bddc4b21e1d559facc4e3ea0a2eff7b3f 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 2.6 alpha 1?
 Core and builtins
 -----------------
 
+- Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack.
+  Also make sure that every exception class has __module__ set to
+  'exceptions'.
+
 - Bug #1550983: emit better error messages for erroneous relative
   imports (if not in package and if beyond toplevel package).
 
@@ -36,6 +40,8 @@ Core and builtins
 Library
 -------
 
+- Fix missing import of the types module in logging.config.
+
 - Patch #1550886: Fix decimal module context management implementation
   to match the localcontext() example from PEP 343.