From 8e628d2342de84e45bef4b944c615948e944913c Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Sun, 13 Mar 2005 09:57:46 +0000 Subject: [PATCH] Made traceback unconditional, to avoid lock contention problems when logging errors occur in a custom importer (SF path #1158052). --- Lib/logging/config.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Lib/logging/config.py b/Lib/logging/config.py index a5c780fe5d9..ea157db5bfc 100644 --- a/Lib/logging/config.py +++ b/Lib/logging/config.py @@ -1,4 +1,4 @@ -# Copyright 2001-2004 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2005 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -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 +import sys, logging, logging.handlers, string, socket, struct, os, traceback try: import thread @@ -195,7 +195,6 @@ def fileConfig(fname, defaults=None): for log in existing: root.manager.loggerDict[log].disabled = 1 except: - import traceback ei = sys.exc_info() traceback.print_exception(ei[0], ei[1], ei[2], None, sys.stderr) del ei