From 9e51cf2f8a21219f1b29f3c19417e7e90a0bd1c4 Mon Sep 17 00:00:00 2001
From: Dave Schuyler <nthparameter@gmail.com>
Date: Tue, 14 Feb 2006 22:20:44 +0000
Subject: [PATCH] changed import of panda modules

---
 direct/src/actor/Actor.py           | 3 ++-
 direct/src/gui/OnscreenGeom.py      | 3 ++-
 direct/src/gui/OnscreenImage.py     | 4 +++-
 direct/src/gui/OnscreenText.py      | 4 +++-
 direct/src/showbase/DirectObject.py | 3 ---
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py
index 99b9a1acea..0c808c7108 100644
--- a/direct/src/actor/Actor.py
+++ b/direct/src/actor/Actor.py
@@ -1,6 +1,7 @@
 """Actor module: contains the Actor class"""
 
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 from pandac.PandaModules import LODNode
 import types
 import copy as copy_module
diff --git a/direct/src/gui/OnscreenGeom.py b/direct/src/gui/OnscreenGeom.py
index f774566364..74a26f0632 100644
--- a/direct/src/gui/OnscreenGeom.py
+++ b/direct/src/gui/OnscreenGeom.py
@@ -1,6 +1,7 @@
 """OnscreenGeom module: contains the OnscreenGeom class"""
 
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 import types
 
 class OnscreenGeom(DirectObject, NodePath):
diff --git a/direct/src/gui/OnscreenImage.py b/direct/src/gui/OnscreenImage.py
index 86a96aabf8..55c7aebfe4 100644
--- a/direct/src/gui/OnscreenImage.py
+++ b/direct/src/gui/OnscreenImage.py
@@ -1,7 +1,9 @@
 """OnscreenImage module: contains the OnscreenImage class"""
 
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 import types
+import string
 
 class OnscreenImage(DirectObject, NodePath):
     def __init__(self, image = None,
diff --git a/direct/src/gui/OnscreenText.py b/direct/src/gui/OnscreenText.py
index 4928c60e20..e4d0d06749 100644
--- a/direct/src/gui/OnscreenText.py
+++ b/direct/src/gui/OnscreenText.py
@@ -1,8 +1,10 @@
 """OnscreenText module: contains the OnscreenText class"""
 
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 import DirectGuiGlobals
 import types
+import string
 
 ## These are the styles of text we might commonly see.  They set the
 ## overall appearance of the text according to one of a number of
diff --git a/direct/src/showbase/DirectObject.py b/direct/src/showbase/DirectObject.py
index a5d1dd0489..372071acb8 100644
--- a/direct/src/showbase/DirectObject.py
+++ b/direct/src/showbase/DirectObject.py
@@ -1,8 +1,5 @@
 
 from MessengerGlobal import messenger
-#from direct.directnotify.DirectNotifyGlobal import *
-from PythonUtil import *
-from pandac.PandaModules import *
 
 class DirectObject:
     """