From 043472cfb51d84038dc40615853126c905d43972 Mon Sep 17 00:00:00 2001 From: Joe Shochet Date: Thu, 7 Feb 2002 18:49:16 +0000 Subject: [PATCH] *** empty log message *** --- direct/src/doc/pandaUserGuide.doc | Bin 103936 -> 107008 bytes direct/src/showbase/PythonUtil.py | 2 +- direct/src/showbase/ShowBase.py | 2 ++ direct/src/task/Task.py | 9 ++++++--- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/direct/src/doc/pandaUserGuide.doc b/direct/src/doc/pandaUserGuide.doc index 556b6f550749c16e9024b8fa125998c15a3add8b..776f7d264a515145034c2e4634af6c1f58157a0c 100644 GIT binary patch delta 16266 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 diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py index c123b69412..8d1c89642c 100644 --- a/direct/src/showbase/PythonUtil.py +++ b/direct/src/showbase/PythonUtil.py @@ -295,7 +295,7 @@ def adjust(command = None, parent = None, **kw): base.wantDIRECT = 1 base.wantTk = 1 import TkGlobal - from Tkinter import * + import Tkinter import EntryScale import Pmw # Create toplevel if needed diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index 8564ec25eb..2c55030520 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -52,6 +52,8 @@ class ShowBase: self.wantStats = self.config.GetBool('want-stats', 0) taskMgr.taskTimerVerbose = self.config.GetBool('task-timer-verbose', 0) + taskMgr.extendedExceptions = self.config.GetBool('extended-exceptions', 0) + taskMgr.pStatsTasks = self.config.GetBool('pstats-tasks', 0) # Set up the TaskManager to reset the PStats clock back diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py index f633ee2beb..514567f058 100644 --- a/direct/src/task/Task.py +++ b/direct/src/task/Task.py @@ -312,6 +312,7 @@ class TaskManager: if (TaskManager.notify == None): TaskManager.notify = directNotify.newCategory("TaskManager") self.taskTimerVerbose = 0 + self.extendedExceptions = 0 self.pStatsTasks = 0 self.resumeFunc = None self.fVerbose = 0 @@ -501,9 +502,11 @@ class TaskManager: except KeyboardInterrupt: self.stop() except: - # self.stop() - # print_exc_plus() - raise + if self.extendedExceptions: + self.stop() + print_exc_plus() + else: + raise def stop(self): # Set a flag so we will stop before beginning next frame