summaryrefslogtreecommitdiffstats
path: root/Lib/logging
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/__init__.py4
-rw-r--r--Lib/logging/config.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 1ef8f44..d5681c8 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -1337,14 +1337,14 @@ def disable(level):
"""
root.manager.disable = level
-def shutdown():
+def shutdown(handlerList=_handlerList):
"""
Perform any cleanup actions in the logging system (e.g. flushing
buffers).
Should be called at application exit.
"""
- for h in _handlerList[:]: # was _handlers.keys():
+ for h in handlerList[:]:
#errors might occur, for example, if files are locked
#we just ignore them if raiseExceptions is not set
try:
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 1d5f8c4..a31e8d0 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -79,7 +79,7 @@ def fileConfig(fname, defaults=None):
logging._acquireLock()
try:
logging._handlers.clear()
- logging._handlerList = []
+ del logging._handlerList[:]
# Handlers add themselves to logging._handlers
handlers = _install_handlers(cp, formatters)
_install_loggers(cp, handlers)
ug_3611974'>bug_3611974 Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclCompile.c3
-rw-r--r--generic/tclParseExpr.c185
3 files changed, 89 insertions, 104 deletions
diff --git a/ChangeLog b/ChangeLog
index 12ef5b9..1bb8d13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-17 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclCompile.c: Revised the new set of expression
+ * generic/tclParseExpr.c: parse error messages.
+
2006-08-16 Don Porter <dgp@users.sourceforge.net>
* generic/tclParseExpr.c: Replace PrecedenceOf() function
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index a24571b..56aa708 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCompile.c,v 1.94 2006/08/10 12:15:31 dkf Exp $
+ * RCS: @(#) $Id: tclCompile.c,v 1.95 2006/08/17 17:43:38 dgp Exp $
*/
#include "tclInt.h"
@@ -1604,6 +1604,7 @@ TclCompileExprWords(
if (TclCompileExpr(interp, script, numBytes, envPtr) == TCL_OK) {
return;
}
+ Tcl_ResetResult(interp);
envPtr->numCommands = savedNumCmds;
envPtr->codeNext = envPtr->codeStart + savedCodeNext;
}
diff --git a/generic/tclParseExpr.c b/generic/tclParseExpr.c