From 76070d84cdea19c20a7d208ab0ae830d52c25bfc Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Wed, 29 Mar 2017 17:39:27 -0600 Subject: [PATCH] fsm: Change FourState's debugPrint to a __method This should stop it from getting overridden by subclasses. --- direct/src/fsm/FourState.py | 32 ++++++++++++------------- direct/src/fsm/FourStateAI.py | 44 +++++++++++++++++------------------ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/direct/src/fsm/FourState.py b/direct/src/fsm/FourState.py index fc24e23ca9..af7b7d650c 100755 --- a/direct/src/fsm/FourState.py +++ b/direct/src/fsm/FourState.py @@ -91,7 +91,7 @@ class FourState: oposite of 'on'). """ self.stateIndex = 0 - assert self.debugPrint("FourState(names=%s)"%(names)) + assert self.__debugPrint("FourState(names=%s)"%(names)) self.track = None self.stateTime = 0.0 self.names = names @@ -131,7 +131,7 @@ class FourState: self.fsm.enterInitialState() def setTrack(self, track): - assert self.debugPrint("setTrack(track=%s)"%(track,)) + assert self.__debugPrint("setTrack(track=%s)"%(track,)) if self.track is not None: self.track.pause() self.track = None @@ -147,27 +147,27 @@ class FourState: # If the client wants the state changed it needs to # send a request to the AI. #def setIsOn(self, isOn): - # assert self.debugPrint("setIsOn(isOn=%s)"%(isOn,)) + # assert self.__debugPrint("setIsOn(isOn=%s)"%(isOn,)) # pass def isOn(self): - assert self.debugPrint("isOn() returning %s (stateIndex=%s)"%(self.stateIndex==4, self.stateIndex)) + assert self.__debugPrint("isOn() returning %s (stateIndex=%s)"%(self.stateIndex==4, self.stateIndex)) return self.stateIndex==4 def changedOnState(self, isOn): """ Allow derived classes to overide this. """ - assert self.debugPrint("changedOnState(isOn=%s)"%(isOn,)) + assert self.__debugPrint("changedOnState(isOn=%s)"%(isOn,)) ##### state 0 ##### def enterState0(self): - assert self.debugPrint("enter0()") + assert self.__debugPrint("enter0()") self.enterStateN(0) def exitState0(self): - assert self.debugPrint("exit0()") + assert self.__debugPrint("exit0()") # It's important for FourStates to broadcast their state # when they are generated on the client. Before I put this in, # if a door was generated and went directly to an 'open' state, @@ -177,43 +177,43 @@ class FourState: ##### state 1 ##### def enterState1(self): - assert self.debugPrint("enterState1()") + assert self.__debugPrint("enterState1()") self.enterStateN(1) def exitState1(self): - assert self.debugPrint("exitState1()") + assert self.__debugPrint("exitState1()") ##### state 2 ##### def enterState2(self): - assert self.debugPrint("enterState2()") + assert self.__debugPrint("enterState2()") self.enterStateN(2) def exitState2(self): - assert self.debugPrint("exitState2()") + assert self.__debugPrint("exitState2()") ##### state 3 ##### def enterState3(self): - assert self.debugPrint("enterState3()") + assert self.__debugPrint("enterState3()") self.enterStateN(3) def exitState3(self): - assert self.debugPrint("exitState3()") + assert self.__debugPrint("exitState3()") ##### state 4 ##### def enterState4(self): - assert self.debugPrint("enterState4()") + assert self.__debugPrint("enterState4()") self.enterStateN(4) self.changedOnState(1) def exitState4(self): - assert self.debugPrint("exitState4()") + assert self.__debugPrint("exitState4()") self.changedOnState(0) if __debug__: - def debugPrint(self, message): + def __debugPrint(self, message): """for debugging""" return self.notify.debug("%d (%d) %s"%( id(self), self.stateIndex==4, message)) diff --git a/direct/src/fsm/FourStateAI.py b/direct/src/fsm/FourStateAI.py index 7b0ebda64d..eee4b43a76 100755 --- a/direct/src/fsm/FourStateAI.py +++ b/direct/src/fsm/FourStateAI.py @@ -94,7 +94,7 @@ class FourStateAI: oposite of 'on'). """ self.stateIndex = 0 - assert self.debugPrint( + assert self.__debugPrint( "FourStateAI(names=%s, durations=%s)" %(names, durations)) self.doLaterTask = None @@ -137,7 +137,7 @@ class FourStateAI: self.fsm.enterInitialState() def delete(self): - assert self.debugPrint("delete()") + assert self.__debugPrint("delete()") if self.doLaterTask is not None: self.doLaterTask.remove() del self.doLaterTask @@ -145,15 +145,15 @@ class FourStateAI: del self.fsm def getState(self): - assert self.debugPrint("getState() returning %s"%(self.stateIndex,)) + assert self.__debugPrint("getState() returning %s"%(self.stateIndex,)) return [self.stateIndex] def sendState(self): - assert self.debugPrint("sendState()") + assert self.__debugPrint("sendState()") self.sendUpdate('setState', self.getState()) def setIsOn(self, isOn): - assert self.debugPrint("setIsOn(isOn=%s)"%(isOn,)) + assert self.__debugPrint("setIsOn(isOn=%s)"%(isOn,)) if isOn: if self.stateIndex != 4: # ...if it's not On; request turning on: @@ -170,7 +170,7 @@ class FourStateAI: # self.fsm.request(self.states[nextState]) def isOn(self): - assert self.debugPrint("isOn() returning %s (stateIndex=%s)"%(self.stateIndex==4, self.stateIndex)) + assert self.__debugPrint("isOn() returning %s (stateIndex=%s)"%(self.stateIndex==4, self.stateIndex)) return self.stateIndex==4 def changedOnState(self, isOn): @@ -179,12 +179,12 @@ class FourStateAI: The self.isOn value has toggled. Call getIsOn() to get the current state. """ - assert self.debugPrint("changedOnState(isOn=%s)"%(isOn,)) + assert self.__debugPrint("changedOnState(isOn=%s)"%(isOn,)) ##### states ##### def switchToNextStateTask(self, task): - assert self.debugPrint("switchToNextStateTask()") + assert self.__debugPrint("switchToNextStateTask()") self.fsm.request(self.states[self.nextStateIndex]) return Task.done @@ -193,11 +193,11 @@ class FourStateAI: This function is intentionaly simple so that derived classes may easily alter the network message. """ - assert self.debugPrint("distributeStateChange()") + assert self.__debugPrint("distributeStateChange()") self.sendState() def enterStateN(self, stateIndex, nextStateIndex): - assert self.debugPrint( + assert self.__debugPrint( "enterStateN(stateIndex=%s, nextStateIndex=%s)"% (stateIndex, nextStateIndex)) self.stateIndex = stateIndex @@ -211,7 +211,7 @@ class FourStateAI: "enterStateN-timer-%s"%id(self)) def exitStateN(self): - assert self.debugPrint("exitStateN()") + assert self.__debugPrint("exitStateN()") if self.doLaterTask: taskMgr.remove(self.doLaterTask) self.doLaterTask=None @@ -219,56 +219,56 @@ class FourStateAI: ##### state 0 ##### def enterState0(self): - assert self.debugPrint("enter0()") + assert self.__debugPrint("enter0()") self.enterStateN(0, 0) def exitState0(self): - assert self.debugPrint("exit0()") + assert self.__debugPrint("exit0()") ##### state 1 ##### def enterState1(self): - #assert self.debugPrint("enterState1()") + #assert self.__debugPrint("enterState1()") self.enterStateN(1, 2) def exitState1(self): - assert self.debugPrint("exitState1()") + assert self.__debugPrint("exitState1()") self.exitStateN() ##### state 2 ##### def enterState2(self): - #assert self.debugPrint("enterState2()") + #assert self.__debugPrint("enterState2()") self.enterStateN(2, 3) def exitState2(self): - assert self.debugPrint("exitState2()") + assert self.__debugPrint("exitState2()") self.exitStateN() ##### state 3 ##### def enterState3(self): - #assert self.debugPrint("enterState3()") + #assert self.__debugPrint("enterState3()") self.enterStateN(3, 4) def exitState3(self): - assert self.debugPrint("exitState3()") + assert self.__debugPrint("exitState3()") self.exitStateN() ##### state 4 ##### def enterState4(self): - assert self.debugPrint("enterState4()") + assert self.__debugPrint("enterState4()") self.enterStateN(4, 1) self.changedOnState(1) def exitState4(self): - assert self.debugPrint("exitState4()") + assert self.__debugPrint("exitState4()") self.exitStateN() self.changedOnState(0) if __debug__: - def debugPrint(self, message): + def __debugPrint(self, message): """for debugging""" return self.notify.debug("%d (%d) %s"%( id(self), self.stateIndex==4, message))