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

 (backport from rev. 51785)

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 22132b1676890edc084d77eccc4d5a5975740961..2d4ec2e9a85a33a2a2cf2b23d925b5da5313018e 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 3f9eee4f87e7585c7874dc7cc8b4d86e0b65c175..2c5d2d4381f5221e930d8d78bd22cfcf91f91ac0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 2.4.4c1?
 Core and builtins
 -----------------
 
+- Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack.
+  Also make sure that every exception class has __module__ set to
+  'exceptions'.
+
 - Overflow checking code in integer division ran afoul of new gcc
   optimizations.  Changed to be more standard-conforming.
 
@@ -86,6 +90,8 @@ Extension Modules
 Library
 -------
 
+- Fix missing import of the types module in logging.config.
+
 - Bug #1112549, DoS attack on cgi.FieldStorage.
 
 - Bug #1257728: Complain about missing VS 2003 in the error message