From: Georg Brandl <georg@python.org>
Date: Wed, 6 Sep 2006 20:05:58 +0000 (+0000)
Subject: Fix missing import of the types module in logging.config.
X-Git-Tag: v2.6a1~2690
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e933137af2e880b53afe5396101c44846dec9bd;p=python

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

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 5ea0d15b64..f14eb122b7 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 43e6a376de..172d087bdd 100644
--- 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.