diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py index c4caee78c7..9126d5e1d9 100644 --- a/direct/src/actor/Actor.py +++ b/direct/src/actor/Actor.py @@ -94,9 +94,7 @@ class Actor(PandaObject, NodePath): self.gotName = 0 root = ModelNode('actor') root.setPreserveTransform(1) - # temporary support for old Panda - #self.assign(NodePath(root)) - self.assign(hidden.attachNewNode(root)) + self.assign(NodePath(root)) self.setGeomNode(self.attachNewNode(ModelNode('actorGeom'))) self.__hasLOD = 0 @@ -185,8 +183,7 @@ class Actor(PandaObject, NodePath): # copy the scene graph elements of other otherCopy = other.copyTo(hidden) - # temporarily commented out for old Panda - #otherCopy.detachNode() + otherCopy.detachNode() # assign these elements to ourselve self.gotName = other.gotName self.assign(otherCopy) diff --git a/direct/src/gui/DirectEntry.py b/direct/src/gui/DirectEntry.py index 0a984252f1..d807475a6c 100644 --- a/direct/src/gui/DirectEntry.py +++ b/direct/src/gui/DirectEntry.py @@ -99,7 +99,6 @@ class DirectEntry(DirectFrame): PGEntry.setCursorKeysActive(self.guiItem, self['cursorKeys']) def setObscureMode(self): - # Temporary try..except to support old Pandas. PGEntry.setObscureMode(self.guiItem, self['obscured']) def setBackgroundFocus(self): diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index 6e57048d1e..2f93b94c7a 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -36,10 +36,7 @@ class ShowBase: self.config = ConfigConfigureGetConfigConfigShowbase if self.config.GetBool('use-vfs', 1): - try: # temporary try .. except for old Pandas - vfs = VirtualFileSystem.getGlobalPtr() - except: - vfs = None + vfs = VirtualFileSystem.getGlobalPtr() else: vfs = None @@ -581,11 +578,7 @@ class ShowBase: """ Returns the current window background color. This assumes the window is set up to clear the color each frame (this is the normal setting). """ - # Temporary try .. except for old Pandas. - try: - return VBase4(self.win.getClearColor()) - except: - return VBase4(self.win.getGsg().getColorClearValue()) + return VBase4(self.win.getClearColor()) def setBackgroundColor(self, *args): """ Sets the window background color to the indicated value. @@ -605,12 +598,7 @@ class ShowBase: else: raise TypeError, ('Invalid number of arguments: %d, expected 1, 3, or 4.' % numArgs) - - # Temporary try .. except for old Pandas. - try: - self.win.setClearColor(color) - except: - self.win.getGsg().setColorClearValue(color) + self.win.setClearColor(color) def toggleBackface(self): if self.backfaceCullingEnabled: