changed imports

direct/src/distributed/DistributedCartesianGrid.py

@@ -1,9 +1,9 @@
 
 from pandac.PandaModules import *
+from direct.interval.IntervalGlobal import *
 
-from direct.distributed import DistributedNode
+from direct.distributed.DistributedNode import DistributedNode
 from direct.task import Task
-from direct.interval.IntervalGlobal import *
 from direct.gui import DirectGuiGlobals
 
 if __debug__:
@@ -11,12 +11,10 @@ if __debug__:
     from direct.directtools.DirectGeometry import *
     from direct.showbase.PythonUtil import randFloat
 
-import CartesianGridBase
-
+from CartesianGridBase import CartesianGridBase
 
-class DistributedCartesianGrid(DistributedNode.DistributedNode,
-                               CartesianGridBase.CartesianGridBase):
 
+class DistributedCartesianGrid(DistributedNode, CartesianGridBase):
     notify = directNotify.newCategory("DistributedCartesianGrid")
     notify.setDebug(0)
 
@@ -25,7 +23,7 @@ class DistributedCartesianGrid(DistributedNode.DistributedNode,
     RuleSeparator = ":"
 
     def __init__(self, cr):
-        DistributedNode.DistributedNode.__init__(self, cr)
+        DistributedNode.__init__(self, cr)
         # Let the derived classes instantiate the NodePath
         self.visAvatar = None
         self.gridVisContext = None
@@ -34,14 +32,14 @@ class DistributedCartesianGrid(DistributedNode.DistributedNode,
             self.haveGridLines = 0
 
     def generate(self):
-        DistributedNode.DistributedNode.generate(self)
+        DistributedNode.generate(self)
 
     def disable(self):
-        DistributedNode.DistributedNode.disable(self)
+        DistributedNode.disable(self)
         self.stopProcessVisibility()
 
     def delete(self):
-        DistributedNode.DistributedNode.delete(self)
+        DistributedNode.delete(self)
         # TODO: when teleporting off an island...
         taskMgr.remove(self.taskName("processVisibility"))
 

direct/src/fsm/FSM.py

@@ -3,7 +3,7 @@ The new Finite State Machine module.  This replaces the modules
 previously called FSM.py (now called ClassicFSM.py).
 """
 
-from direct.showbase import DirectObject
+from direct.showbase.DirectObject import DirectObject
 from direct.directnotify import DirectNotifyGlobal
 from direct.showbase import PythonUtil
 import types
@@ -18,7 +18,7 @@ class AlreadyInTransition(FSMException):
 class RequestDenied(FSMException):
     pass
 
-class FSM(DirectObject.DirectObject):
+class FSM(DirectObject):
     """
     A Finite State Machine.  This is intended to be the base class
     of any number of specific machines, which consist of a collection
@@ -157,6 +157,7 @@ class FSM(DirectObject.DirectObject):
 
     def __del__(self):
         self.cleanup()
+        DirectObject.__del__(self)
 
     def cleanup(self):
         # A convenience function to force the FSM to clean itself up
@@ -188,11 +189,13 @@ class FSM(DirectObject.DirectObject):
         exitState() followed by enterState()."""
 
         assert isinstance(request, types.StringTypes)
-        self.notify.debug("%s.forceTransition(%s, %s" % (self.name, request, str(args)[1:]))
+        self.notify.debug("%s.forceTransition(%s, %s" % (
+            self.name, request, str(args)[1:]))
 
         if not self.state:
             # Queue up the request.
-            self.__requestQueue.append(PythonUtil.Functor(self.forceTransition, request, *args))
+            self.__requestQueue.append(PythonUtil.Functor(
+                self.forceTransition, request, *args))
             return
 
         self.__setState(request, *args)
@@ -210,10 +213,12 @@ class FSM(DirectObject.DirectObject):
         """
 
         assert isinstance(request, types.StringTypes)
-        self.notify.debug("%s.demand(%s, %s" % (self.name, request, str(args)[1:]))
+        self.notify.debug("%s.demand(%s, %s" % (
+            self.name, request, str(args)[1:]))
         if not self.state:
             # Queue up the request.
-            self.__requestQueue.append(PythonUtil.Functor(self.demand, request, *args))
+            self.__requestQueue.append(PythonUtil.Functor(
+                self.demand, request, *args))
             return
 
         if not self.request(request, *args):
@@ -243,7 +248,8 @@ class FSM(DirectObject.DirectObject):
         transition is complete)."""
 
         assert isinstance(request, types.StringTypes)
-        self.notify.debug("%s.request(%s, %s" % (self.name, request, str(args)[1:]))
+        self.notify.debug("%s.request(%s, %s" % (
+            self.name, request, str(args)[1:]))
 
         if not self.state:
             error = "requested %s while FSM is in transition from %s to %s." % (request, self.oldState, self.newState)