diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py index 677415cabd..78580d0b6c 100644 --- a/direct/src/actor/Actor.py +++ b/direct/src/actor/Actor.py @@ -1120,10 +1120,6 @@ class Actor(DirectObject, NodePath): optimal than controlJoint() for cases in which the transform is not intended to be animated during the lifetime of the Actor. """ - # Temporary condition for old Pandas. - if not hasattr(PartBundle, 'controlJoint'): - return - if transform == None: transform = TransformState.makePosHprScale(pos, hpr, scale) diff --git a/direct/src/gui/DirectEntry.py b/direct/src/gui/DirectEntry.py index c8aafd1d3f..ede1f4840f 100644 --- a/direct/src/gui/DirectEntry.py +++ b/direct/src/gui/DirectEntry.py @@ -144,11 +144,7 @@ class DirectEntry(DirectFrame): DirectFrame.destroy(self) def setup(self): - # Temporary condition for old pandas. - if hasattr(self.guiItem, 'setupMinimal'): - self.guiItem.setupMinimal(self['width'], self['numLines']) - else: - self.guiItem.setup(self['width'], self['numLines']) + self.guiItem.setupMinimal(self['width'], self['numLines']) def setFocus(self): PGEntry.setFocus(self.guiItem, self['focus']) diff --git a/direct/src/showbase/Loader.py b/direct/src/showbase/Loader.py index 59743ed28b..e96f3a9a5e 100644 --- a/direct/src/showbase/Loader.py +++ b/direct/src/showbase/Loader.py @@ -51,9 +51,7 @@ class Loader(DirectObject): def destroy(self): self.ignore(self.hook) - # Temp condition for old Panda. - if hasattr(self.loader, "stopThreads"): - self.loader.stopThreads() + self.loader.stopThreads() del self.base del self.loader