diff --git a/direct/src/cluster/ClusterConfig.py b/direct/src/cluster/ClusterConfig.py
index 7ab269c8d4..53dc436796 100644
--- a/direct/src/cluster/ClusterConfig.py
+++ b/direct/src/cluster/ClusterConfig.py
@@ -1,4 +1,4 @@
-from direct.showbase.DirectObject import *
+
 from ClusterClient import *
 import string
 
diff --git a/direct/src/directdevices/DirectDeviceManager.py b/direct/src/directdevices/DirectDeviceManager.py
index f2c5a005d8..983d0f5fb2 100644
--- a/direct/src/directdevices/DirectDeviceManager.py
+++ b/direct/src/directdevices/DirectDeviceManager.py
@@ -1,6 +1,6 @@
 """ Class used to create and control vrpn devices """
 
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from pandac.PandaModules import *
 
 ANALOG_MIN = -0.95
diff --git a/direct/src/directtools/DirectGeometry.py b/direct/src/directtools/DirectGeometry.py
index f3bf540ec1..0360b6594b 100644
--- a/direct/src/directtools/DirectGeometry.py
+++ b/direct/src/directtools/DirectGeometry.py
@@ -1,5 +1,5 @@
+
 from pandac.PandaModules import *
-from direct.showbase.DirectObject import *
 from DirectGlobals import *
 from DirectUtil import *
 import math
diff --git a/direct/src/directtools/DirectGrid.py b/direct/src/directtools/DirectGrid.py
index 4d7d11d39c..afd72ba02c 100644
--- a/direct/src/directtools/DirectGrid.py
+++ b/direct/src/directtools/DirectGrid.py
@@ -1,8 +1,10 @@
-from direct.showbase.DirectObject import *
+
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 from DirectUtil import *
 from DirectGeometry import *
 
-class DirectGrid(NodePath,DirectObject):
+class DirectGrid(NodePath, DirectObject):
     def __init__(self):
         # Initialize superclass
         NodePath.__init__(self)
diff --git a/direct/src/directtools/DirectLights.py b/direct/src/directtools/DirectLights.py
index 64791e6b89..a8ac3363ef 100644
--- a/direct/src/directtools/DirectLights.py
+++ b/direct/src/directtools/DirectLights.py
@@ -1,4 +1,5 @@
-from direct.showbase.DirectObject import *
+
+from pandac.PandaModules import *
 from string import lower
 
 class DirectLight(NodePath):
diff --git a/direct/src/directtools/DirectUtil.py b/direct/src/directtools/DirectUtil.py
index f2c94a65e8..8db6c8fe3c 100644
--- a/direct/src/directtools/DirectUtil.py
+++ b/direct/src/directtools/DirectUtil.py
@@ -1,4 +1,4 @@
-from direct.showbase.DirectObject import *
+
 from DirectGlobals import *
 
 # Routines to adjust values
@@ -13,7 +13,9 @@ def CLAMP(val, minVal, maxVal):
 
 # Create a tk compatible color string
 def getTkColorString(color):
-    """ Print out a Tk compatible version of a color string """
+    """
+    Print out a Tk compatible version of a color string
+    """
     def toHex(intVal):
         val = int(round(intVal))
         if val < 16:
@@ -27,7 +29,9 @@ def getTkColorString(color):
 
 ## Background Color ##
 def lerpBackgroundColor(r,g,b,duration):
-    """ Function to lerp background color to a new value """
+    """
+    Function to lerp background color to a new value
+    """
     def lerpColor(state):
         dt = globalClock.getDt()
         state.time += dt
diff --git a/direct/src/distributed/DistributedObjectGlobal.py b/direct/src/distributed/DistributedObjectGlobal.py
index 719accf772..5ce5d0d396 100755
--- a/direct/src/distributed/DistributedObjectGlobal.py
+++ b/direct/src/distributed/DistributedObjectGlobal.py
@@ -1,6 +1,5 @@
 """DistributedObjectGlobal module: contains the DistributedObjectGlobal class"""
 
-from direct.showbase.DirectObject import *
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.distributed.DistributedObject import DistributedObject
 
diff --git a/direct/src/gui/OnscreenGeom.py b/direct/src/gui/OnscreenGeom.py
index 74a26f0632..f487c4b2ac 100644
--- a/direct/src/gui/OnscreenGeom.py
+++ b/direct/src/gui/OnscreenGeom.py
@@ -1,8 +1,9 @@
 """OnscreenGeom module: contains the OnscreenGeom class"""
 
+import string
+import types
 from pandac.PandaModules import *
 from direct.showbase.DirectObject import DirectObject
-import types
 
 class OnscreenGeom(DirectObject, NodePath):
     def __init__(self, geom = None,
diff --git a/direct/src/interval/ProjectileInterval.py b/direct/src/interval/ProjectileInterval.py
index f84a0f1a1d..20e24b5de0 100755
--- a/direct/src/interval/ProjectileInterval.py
+++ b/direct/src/interval/ProjectileInterval.py
@@ -1,6 +1,5 @@
 """ProjectileInterval module: contains the ProjectileInterval class"""
 
-from direct.showbase.DirectObject import *
 from pandac.PandaModules import *
 from Interval import Interval
 from direct.showbase.PythonUtil import lerp
diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py
index 733d5c3332..b478be6bd2 100644
--- a/direct/src/leveleditor/LevelEditor.py
+++ b/direct/src/leveleditor/LevelEditor.py
@@ -1,5 +1,7 @@
+
+from pandac.PandaModules import *
 from direct.directbase.DirectStart import *
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from PieMenu import *
 from direct.gui.DirectGuiGlobals import *
 from direct.showbase.TkGlobal import *
diff --git a/direct/src/leveleditor/PieMenu.py b/direct/src/leveleditor/PieMenu.py
index 770a8807e7..6fb5951d06 100644
--- a/direct/src/leveleditor/PieMenu.py
+++ b/direct/src/leveleditor/PieMenu.py
@@ -1,4 +1,6 @@
-from direct.showbase.DirectObject import *
+
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 from direct.directtools.DirectGeometry import *
 from direct.task import Task
 
@@ -21,7 +23,7 @@ class PieMenu(NodePath, DirectObject):
         if self.numItems == 0:
             self.degreesPerItem = 0.0
         else:
-            self.degreesPerItem = 360.0/self.numItems            
+            self.degreesPerItem = 360.0/self.numItems
         self.itemOffset = self.degreesPerItem / 2.0
         self.sfx = self.visibleMenu.getSx()
         self.sfz = self.visibleMenu.getSz()
diff --git a/direct/src/showutil/Effects.py b/direct/src/showutil/Effects.py
index 32c748b761..496feffec8 100644
--- a/direct/src/showutil/Effects.py
+++ b/direct/src/showutil/Effects.py
@@ -1,5 +1,5 @@
 """ Showutil Effects module: contains code for useful showcode effects. """
-from direct.showbase.DirectObject import *
+
 from pandac.PandaModules import *
 from direct.interval.IntervalGlobal import *
 
diff --git a/direct/src/tkpanels/DirectSessionPanel.py b/direct/src/tkpanels/DirectSessionPanel.py
index 493a6bd8f8..fcfe0ddaee 100644
--- a/direct/src/tkpanels/DirectSessionPanel.py
+++ b/direct/src/tkpanels/DirectSessionPanel.py
@@ -1,7 +1,6 @@
 """ DIRECT Session Main panel """
 
 # Import Tkinter, Pmw, and the dial code
-from direct.showbase.DirectObject import *
 from direct.showbase.TkGlobal import *
 from direct.tkwidgets.AppShell import *
 
diff --git a/direct/src/tkpanels/FSMInspector.py b/direct/src/tkpanels/FSMInspector.py
index d009bc9e58..e99f8941c9 100644
--- a/direct/src/tkpanels/FSMInspector.py
+++ b/direct/src/tkpanels/FSMInspector.py
@@ -1,5 +1,4 @@
 """ Finite State Machine Inspector module """
-from direct.showbase.DirectObject import *
 from direct.tkwidgets.AppShell import *
 from direct.showbase.TkGlobal import *
 from tkSimpleDialog import askstring
diff --git a/direct/src/tkpanels/MopathRecorder.py b/direct/src/tkpanels/MopathRecorder.py
index 41eb41dfcd..4d1ff3700d 100644
--- a/direct/src/tkpanels/MopathRecorder.py
+++ b/direct/src/tkpanels/MopathRecorder.py
@@ -1,7 +1,8 @@
 """ Mopath Recorder Panel Module """
 
 # Import Tkinter, Pmw, and the dial code from this directory tree.
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
+from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
 from direct.tkwidgets.AppShell import *
 from direct.directtools.DirectGlobals import *
diff --git a/direct/src/tkpanels/Placer.py b/direct/src/tkpanels/Placer.py
index f080c8f83d..f093c9228a 100644
--- a/direct/src/tkpanels/Placer.py
+++ b/direct/src/tkpanels/Placer.py
@@ -1,7 +1,7 @@
 """ DIRECT Nine DoF Manipulation Panel """
 
 # Import Tkinter, Pmw, and the dial code from this directory tree.
-from direct.showbase.DirectObject import *
+from pandac.PandaModules import *
 from direct.showbase.TkGlobal import *
 from direct.tkwidgets.AppShell import *
 from direct.tkwidgets import Dial
diff --git a/direct/src/tkwidgets/AppShell.py b/direct/src/tkwidgets/AppShell.py
index 5800ff135c..6f6883bf17 100644
--- a/direct/src/tkwidgets/AppShell.py
+++ b/direct/src/tkwidgets/AppShell.py
@@ -4,7 +4,7 @@ This is an adaption of AppShell.py found in Python and Tkinter Programming
 by John E. Grayson which is a streamlined adaptation of GuiAppD.py, originally
 created by Doug Hellmann (doughellmann@mindspring.com).
 """
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
 from tkFileDialog import *
 import Dial
diff --git a/direct/src/tkwidgets/EntryScale.py b/direct/src/tkwidgets/EntryScale.py
index e11261e690..d7ea694261 100644
--- a/direct/src/tkwidgets/EntryScale.py
+++ b/direct/src/tkwidgets/EntryScale.py
@@ -1,7 +1,7 @@
 """
 EntryScale Class: Scale with a label, and a linked and validated entry
 """
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
 import string
 import tkColorChooser
diff --git a/direct/src/tkwidgets/Floater.py b/direct/src/tkwidgets/Floater.py
index 68aa5c23bd..7fc66bf239 100644
--- a/direct/src/tkwidgets/Floater.py
+++ b/direct/src/tkwidgets/Floater.py
@@ -2,7 +2,6 @@
 Floater Class: Velocity style controller for floating point values with
                 a label, entry (validated), and scale
 """
-from direct.showbase.DirectObject import *
 from direct.showbase.TkGlobal import *
 from Valuator import *
 from direct.task import Task
diff --git a/direct/src/tkwidgets/SceneGraphExplorer.py b/direct/src/tkwidgets/SceneGraphExplorer.py
index a8fe70ade5..5347f560e5 100644
--- a/direct/src/tkwidgets/SceneGraphExplorer.py
+++ b/direct/src/tkwidgets/SceneGraphExplorer.py
@@ -1,4 +1,4 @@
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from direct.showbase.TkGlobal import *
 from Tree import *
 
diff --git a/direct/src/tkwidgets/Tree.py b/direct/src/tkwidgets/Tree.py
index eb70a2fd1b..7a7e3e0f86 100644
--- a/direct/src/tkwidgets/Tree.py
+++ b/direct/src/tkwidgets/Tree.py
@@ -19,7 +19,6 @@ import os
 import sys
 import string
 from direct.showbase.TkGlobal import *
-from direct.showbase.DirectObject import *
 
 # Initialize icon directory
 ICONDIR = getModelPath().findFile(Filename('icons')).toOsSpecific()
diff --git a/doc/SceneEditor/seCameraControl.py b/doc/SceneEditor/seCameraControl.py
index d878aa554f..b07c500091 100644
--- a/doc/SceneEditor/seCameraControl.py
+++ b/doc/SceneEditor/seCameraControl.py
@@ -11,7 +11,7 @@
 # (If we do change original directools, it will force user has to install the latest version of OUR Panda)
 #
 #################################################################
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from direct.directtools.DirectUtil import *
 from seGeometry import *
 from direct.directtools.DirectGlobals import *
diff --git a/doc/SceneEditor/seForceGroup.py b/doc/SceneEditor/seForceGroup.py
index 778849150e..c8ba2b9d4e 100644
--- a/doc/SceneEditor/seForceGroup.py
+++ b/doc/SceneEditor/seForceGroup.py
@@ -1,5 +1,5 @@
 from pandac.PandaModules import *
-from direct.showbase.DirectObject import *
+from direct.showbase.DirectObject import DirectObject
 from direct.showbase.PhysicsManagerGlobal import *
 #Manakel 2/12/2005: replace from pandac import by from pandac.PandaModules import
 from pandac.PandaModules import ForceNode
diff --git a/doc/SceneEditor/seGeometry.py b/doc/SceneEditor/seGeometry.py
index 84f6bdfe3e..1d22bcb891 100644
--- a/doc/SceneEditor/seGeometry.py
+++ b/doc/SceneEditor/seGeometry.py
@@ -13,7 +13,6 @@
 #################################################################
 
 from pandac.PandaModules import *
-from direct.showbase.DirectObject import *
 from direct.directtools.DirectGlobals import *
 from direct.directtools.DirectUtil import *
 import math