From a9873709f8a1f6913b238eb7c882388e8558c52f Mon Sep 17 00:00:00 2001
From: Mark Mine <mark.mine@disney.com>
Date: Fri, 8 Feb 2002 18:48:32 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/directtools/DirectSession.py |  4 ++--
 direct/src/tkpanels/TaskManagerPanel.py | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/direct/src/directtools/DirectSession.py b/direct/src/directtools/DirectSession.py
index c2bd0e0452..290ab6bdeb 100644
--- a/direct/src/directtools/DirectSession.py
+++ b/direct/src/directtools/DirectSession.py
@@ -1,5 +1,5 @@
 from PandaObject import *
-from DirectUtil import *
+from DirectUtil import*
 from DirectCameraControl import *
 from DirectManipulation import *
 from DirectSelection import *
@@ -165,7 +165,7 @@ class DirectSession(PandaObject):
                             'mouse3', 'mouse3-up']
 
         if base.wantTk:
-            from TkGlobal import *
+            from TkGlobal import tkroot
             self.panel = DirectSessionPanel(parent = tkroot)
 
         if self.iAmAServer:
diff --git a/direct/src/tkpanels/TaskManagerPanel.py b/direct/src/tkpanels/TaskManagerPanel.py
index bd73392ed2..43788d606c 100644
--- a/direct/src/tkpanels/TaskManagerPanel.py
+++ b/direct/src/tkpanels/TaskManagerPanel.py
@@ -1,6 +1,5 @@
 from AppShell import *
 
-
 class TaskManagerPanel(AppShell):
     # Override class variables here
     appname = 'TaskManager Panel'
@@ -13,13 +12,14 @@ class TaskManagerPanel(AppShell):
         INITOPT = Pmw.INITOPT
         optiondefs = (
             ('title',       self.appname,       None),
-            ('taskMgr',     None,            None)
             )
         self.defineoptions(kw, optiondefs)
 
+        self.taskMgr = taskMgr
+        
         # Call superclass initialization function
         AppShell.__init__(self, parent = parent)
-        
+
         self.initialiseoptions(TaskManagerPanel)
 
     def createInterface(self):
@@ -27,7 +27,7 @@ class TaskManagerPanel(AppShell):
         # Get a handle on the file menu so commands can be inserted
         # before quit item
         self.taskMgrWidget = TaskManagerWidget(
-            self.interior(), self['taskMgr'])
+            self.interior(), self.taskMgr)
 
 
     def onDestroy(self, event):
@@ -46,7 +46,7 @@ class TaskManagerWidget(PandaObject):
         tasks managed by the taskManager.
         """
         # Make sure TK mainloop is running
-        from TkGlobal import *
+        import TkGlobal
         # Record parent (used by ok cancel dialog boxes)
         self.parent = parent
         # Record taskManager