summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2006-09-06 20:05:58 (GMT)
committerGeorg Brandl <georg@python.org>2006-09-06 20:05:58 (GMT)
commit4e933137af2e880b53afe5396101c44846dec9bd (patch)
treeb3427bcc6fb3495a3ac1ab7e82eedd833b98d399
parent38f6237dfe1355192a11fe004d32f547cd1eadbd (diff)
downloadcpython-4e933137af2e880b53afe5396101c44846dec9bd.zip
cpython-4e933137af2e880b53afe5396101c44846dec9bd.tar.gz
cpython-4e933137af2e880b53afe5396101c44846dec9bd.tar.bz2
Fix missing import of the types module in logging.config.
-rw-r--r--Lib/logging/config.py2
-rw-r--r--Misc/NEWS6
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 5ea0d15..f14eb12 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 43e6a37..172d087 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.