diff --git a/direct/src/particles/ParticleEffect.py b/direct/src/particles/ParticleEffect.py index 82f0904715..bfb15d714f 100644 --- a/direct/src/particles/ParticleEffect.py +++ b/direct/src/particles/ParticleEffect.py @@ -1,7 +1,5 @@ - -from panda3d.core import * - # Leave these imports in, they may be used by ptf files. +from panda3d.core import * from panda3d.physics import * from . import Particles from . import ForceGroup diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py index ea08247823..58d3ce3f14 100644 --- a/direct/src/showbase/PythonUtil.py +++ b/direct/src/showbase/PythonUtil.py @@ -1827,7 +1827,7 @@ class DelayedCall: self._removeDoLater() def finish(self): if not self._finished: - self._doCallback() + self._doCallback(None) self.destroy() def _addDoLater(self): taskMgr.doMethodLater(self._delay, self._doCallback, self._taskName) diff --git a/direct/src/showbase/TaskThreaded.py b/direct/src/showbase/TaskThreaded.py index a6634cd751..279c224a21 100755 --- a/direct/src/showbase/TaskThreaded.py +++ b/direct/src/showbase/TaskThreaded.py @@ -44,7 +44,8 @@ class TaskThreaded: self.ignoreAll() def getTimeslice(self): - return self.___timeslice + return self.__timeslice + def setTimeslice(self, timeslice): self.__timeslice = timeslice diff --git a/direct/src/tkpanels/Inspector.py b/direct/src/tkpanels/Inspector.py index ddbbe30dc1..70f67fa2bc 100644 --- a/direct/src/tkpanels/Inspector.py +++ b/direct/src/tkpanels/Inspector.py @@ -219,7 +219,7 @@ class SequenceInspector(Inspector): if partNumber == 0: return self.object index = self.privatePartNumber(partNumber) - if type(index) == IntType: + if isinstance(index, int): return self.object[index] else: return getattr(self.object, index)