From: Georg Brandl <georg@python.org>
Date: Wed, 6 Sep 2006 20:06:20 +0000 (+0000)
Subject: Fix missing import of the types module in logging.config.
X-Git-Tag: v2.4.4c1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e00ffffed33239ef4c05acc6bc1b56140c2d81bf;p=thirdparty%2FPython%2Fcpython.git

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 22132b167689..2d4ec2e9a85a 100644
--- 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 3f9eee4f87e7..2c5d2d4381f5 100644
--- 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