From 0846a89677604a7b225b7db2d86779e3549031ba Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Mon, 27 Jun 2016 00:06:40 -0700 Subject: [PATCH] general: Stop using several deprecated pandac.PandaModules imports. --- direct/src/controls/BattleWalker.py | 2 +- direct/src/controls/NonPhysicsWalker.py | 2 +- direct/src/distributed/CartesianGridBase.py | 2 +- direct/src/distributed/ClientRepositoryBase.py | 3 ++- direct/src/distributed/ConnectionRepository.py | 3 ++- direct/src/distributed/DistributedCamera.py | 3 ++- direct/src/distributed/DistributedCameraOV.py | 3 ++- direct/src/distributed/DistributedCartesianGrid.py | 3 ++- direct/src/distributed/DistributedCartesianGridAI.py | 3 ++- direct/src/distributed/DistributedNodeAI.py | 2 +- direct/src/distributed/DistributedObjectGlobalUD.py | 4 ++-- direct/src/distributed/DistributedObjectUD.py | 3 ++- direct/src/distributed/DistributedSmoothNode.py | 3 ++- direct/src/distributed/DoInterestManager.py | 3 ++- direct/src/distributed/GridParent.py | 3 ++- direct/src/distributed/ServerRepository.py | 3 ++- direct/src/distributed/TimeManager.py | 2 +- direct/src/distributed/TimeManagerAI.py | 2 +- direct/src/showbase/ExceptionVarDump.py | 1 + direct/src/showbase/LeakDetectors.py | 2 +- direct/src/showbase/MirrorDemo.py | 2 +- direct/src/showbase/ShadowDemo.py | 2 +- direct/src/showbase/ShadowPlacer.py | 2 +- 23 files changed, 35 insertions(+), 23 deletions(-) diff --git a/direct/src/controls/BattleWalker.py b/direct/src/controls/BattleWalker.py index a26beb4103..104dc3e55b 100755 --- a/direct/src/controls/BattleWalker.py +++ b/direct/src/controls/BattleWalker.py @@ -1,7 +1,7 @@ from direct.showbase.InputStateGlobal import inputState from direct.task.Task import Task -from pandac.PandaModules import * +from panda3d.core import * from . import GravityWalker BattleStrafe = 0 diff --git a/direct/src/controls/NonPhysicsWalker.py b/direct/src/controls/NonPhysicsWalker.py index 02d2edae30..de5a6bfb00 100755 --- a/direct/src/controls/NonPhysicsWalker.py +++ b/direct/src/controls/NonPhysicsWalker.py @@ -19,7 +19,7 @@ from direct.showbase import DirectObject from direct.controls.ControlManager import CollisionHandlerRayStart from direct.showbase.InputStateGlobal import inputState from direct.task.Task import Task -from pandac.PandaModules import * +from panda3d.core import * class NonPhysicsWalker(DirectObject.DirectObject): notify = DirectNotifyGlobal.directNotify.newCategory("NonPhysicsWalker") diff --git a/direct/src/distributed/CartesianGridBase.py b/direct/src/distributed/CartesianGridBase.py index d45fb00292..f5e9d90339 100755 --- a/direct/src/distributed/CartesianGridBase.py +++ b/direct/src/distributed/CartesianGridBase.py @@ -1,4 +1,4 @@ -from pandac.PandaModules import Vec3 +from panda3d.core import Vec3 # Utility functions that are useful to both AI and client CartesianGrid code class CartesianGridBase: diff --git a/direct/src/distributed/ClientRepositoryBase.py b/direct/src/distributed/ClientRepositoryBase.py index 9836f0fd0b..826d3058fd 100644 --- a/direct/src/distributed/ClientRepositoryBase.py +++ b/direct/src/distributed/ClientRepositoryBase.py @@ -1,4 +1,5 @@ -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * from .MsgTypes import * from direct.task import Task from direct.directnotify import DirectNotifyGlobal diff --git a/direct/src/distributed/ConnectionRepository.py b/direct/src/distributed/ConnectionRepository.py index deda5ab5c6..105b77a9a9 100644 --- a/direct/src/distributed/ConnectionRepository.py +++ b/direct/src/distributed/ConnectionRepository.py @@ -1,4 +1,5 @@ -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * from direct.task import Task from direct.directnotify.DirectNotifyGlobal import directNotify from direct.distributed.DoInterestManager import DoInterestManager diff --git a/direct/src/distributed/DistributedCamera.py b/direct/src/distributed/DistributedCamera.py index 297a24bf98..8c9b076338 100755 --- a/direct/src/distributed/DistributedCamera.py +++ b/direct/src/distributed/DistributedCamera.py @@ -1,4 +1,5 @@ -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * from direct.fsm.FSM import FSM from direct.interval.IntervalGlobal import * from direct.distributed.DistributedObject import DistributedObject diff --git a/direct/src/distributed/DistributedCameraOV.py b/direct/src/distributed/DistributedCameraOV.py index 82945de29e..a539b12794 100755 --- a/direct/src/distributed/DistributedCameraOV.py +++ b/direct/src/distributed/DistributedCameraOV.py @@ -1,4 +1,5 @@ -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * from direct.distributed.DistributedObjectOV import DistributedObjectOV class DistributedCameraOV(DistributedObjectOV): diff --git a/direct/src/distributed/DistributedCartesianGrid.py b/direct/src/distributed/DistributedCartesianGrid.py index 8c156af9d1..3942f3a154 100755 --- a/direct/src/distributed/DistributedCartesianGrid.py +++ b/direct/src/distributed/DistributedCartesianGrid.py @@ -1,5 +1,6 @@ -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * from direct.interval.IntervalGlobal import * from direct.directnotify.DirectNotifyGlobal import directNotify diff --git a/direct/src/distributed/DistributedCartesianGridAI.py b/direct/src/distributed/DistributedCartesianGridAI.py index 3b830b8028..2ad2983aa1 100755 --- a/direct/src/distributed/DistributedCartesianGridAI.py +++ b/direct/src/distributed/DistributedCartesianGridAI.py @@ -1,5 +1,6 @@ -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * from direct.directnotify.DirectNotifyGlobal import directNotify from direct.task import Task from .DistributedNodeAI import DistributedNodeAI diff --git a/direct/src/distributed/DistributedNodeAI.py b/direct/src/distributed/DistributedNodeAI.py index 3d30e8d707..f119ee6a93 100644 --- a/direct/src/distributed/DistributedNodeAI.py +++ b/direct/src/distributed/DistributedNodeAI.py @@ -1,4 +1,4 @@ -from pandac.PandaModules import NodePath +from panda3d.core import NodePath from . import DistributedObjectAI from . import GridParent diff --git a/direct/src/distributed/DistributedObjectGlobalUD.py b/direct/src/distributed/DistributedObjectGlobalUD.py index c5be6f012a..b8f84b472e 100755 --- a/direct/src/distributed/DistributedObjectGlobalUD.py +++ b/direct/src/distributed/DistributedObjectGlobalUD.py @@ -35,9 +35,9 @@ class DistributedObjectGlobalUD(DistributedObjectUD): def __execMessage(self, message): if not self.ExecNamespace: # Import some useful variables into the ExecNamespace initially. - import pandac.PandaModules + import panda3d.core - for key, value in pandac.PandaModules.__dict__.items(): + for key, value in panda3d.core.__dict__.items(): if not key.startswith('__'): self.ExecNamespace[key] = value #self.importExecNamespace() diff --git a/direct/src/distributed/DistributedObjectUD.py b/direct/src/distributed/DistributedObjectUD.py index 4309ad7d80..c67d0004cc 100755 --- a/direct/src/distributed/DistributedObjectUD.py +++ b/direct/src/distributed/DistributedObjectUD.py @@ -3,7 +3,8 @@ from direct.directnotify.DirectNotifyGlobal import directNotify from direct.distributed.DistributedObjectBase import DistributedObjectBase from direct.showbase import PythonUtil -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * #from PyDatagram import PyDatagram #from PyDatagramIterator import PyDatagramIterator diff --git a/direct/src/distributed/DistributedSmoothNode.py b/direct/src/distributed/DistributedSmoothNode.py index cdc2dc034e..1d6aef43fb 100644 --- a/direct/src/distributed/DistributedSmoothNode.py +++ b/direct/src/distributed/DistributedSmoothNode.py @@ -1,6 +1,7 @@ """DistributedSmoothNode module: contains the DistributedSmoothNode class""" -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * from .ClockDelta import * from . import DistributedNode from . import DistributedSmoothNodeBase diff --git a/direct/src/distributed/DoInterestManager.py b/direct/src/distributed/DoInterestManager.py index a81000a788..eb616d3f26 100755 --- a/direct/src/distributed/DoInterestManager.py +++ b/direct/src/distributed/DoInterestManager.py @@ -7,7 +7,8 @@ zone, remove interest in that zone. p.s. A great deal of this code is just code moved from ClientRepository.py. """ -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * from .MsgTypes import * from direct.showbase.PythonUtil import * from direct.showbase import DirectObject diff --git a/direct/src/distributed/GridParent.py b/direct/src/distributed/GridParent.py index 1fc9713897..5d5d47b8e5 100755 --- a/direct/src/distributed/GridParent.py +++ b/direct/src/distributed/GridParent.py @@ -1,5 +1,6 @@ -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * # # GridParent.py diff --git a/direct/src/distributed/ServerRepository.py b/direct/src/distributed/ServerRepository.py index 11cec06ac3..4031998b50 100644 --- a/direct/src/distributed/ServerRepository.py +++ b/direct/src/distributed/ServerRepository.py @@ -1,6 +1,7 @@ """ServerRepository module: contains the ServerRepository class""" -from pandac.PandaModules import * +from panda3d.core import * +from panda3d.direct import * from direct.distributed.MsgTypesCMU import * from direct.task import Task from direct.directnotify import DirectNotifyGlobal diff --git a/direct/src/distributed/TimeManager.py b/direct/src/distributed/TimeManager.py index f74a97300b..714abd7f7d 100644 --- a/direct/src/distributed/TimeManager.py +++ b/direct/src/distributed/TimeManager.py @@ -1,5 +1,5 @@ from direct.showbase.DirectObject import * -from pandac.PandaModules import * +from panda3d.core import * from direct.task import Task from direct.distributed import DistributedObject from direct.directnotify import DirectNotifyGlobal diff --git a/direct/src/distributed/TimeManagerAI.py b/direct/src/distributed/TimeManagerAI.py index c912394326..2e235523ce 100644 --- a/direct/src/distributed/TimeManagerAI.py +++ b/direct/src/distributed/TimeManagerAI.py @@ -1,5 +1,5 @@ from direct.distributed.ClockDelta import * -from pandac.PandaModules import * +from panda3d.core import * from direct.distributed import DistributedObjectAI class TimeManagerAI(DistributedObjectAI.DistributedObjectAI): diff --git a/direct/src/showbase/ExceptionVarDump.py b/direct/src/showbase/ExceptionVarDump.py index 82060a7d24..42aca9b7c9 100755 --- a/direct/src/showbase/ExceptionVarDump.py +++ b/direct/src/showbase/ExceptionVarDump.py @@ -1,5 +1,6 @@ __all__ = ["install"] +from panda3d.core import * from direct.directnotify.DirectNotifyGlobal import directNotify from direct.showbase.PythonUtil import fastRepr import sys diff --git a/direct/src/showbase/LeakDetectors.py b/direct/src/showbase/LeakDetectors.py index 1124d1301d..38d45d225b 100755 --- a/direct/src/showbase/LeakDetectors.py +++ b/direct/src/showbase/LeakDetectors.py @@ -1,6 +1,6 @@ # objects that report different types of leaks to the ContainerLeakDetector -from pandac.PandaModules import * +from panda3d.core import * from direct.showbase.DirectObject import DirectObject from direct.showbase.Job import Job import gc, sys diff --git a/direct/src/showbase/MirrorDemo.py b/direct/src/showbase/MirrorDemo.py index f72142b634..e2a77dbf82 100755 --- a/direct/src/showbase/MirrorDemo.py +++ b/direct/src/showbase/MirrorDemo.py @@ -23,7 +23,7 @@ surface are possible, like a funhouse mirror. However, the reflection itself is always basically planar; for more accurate convex reflections, you will need to use a sphere map or a cube map.""" -from pandac.PandaModules import * +from panda3d.core import * from direct.task import Task def setupMirror(name, width, height, rootCamera = None): diff --git a/direct/src/showbase/ShadowDemo.py b/direct/src/showbase/ShadowDemo.py index b7fff5e596..78f9d33dd0 100755 --- a/direct/src/showbase/ShadowDemo.py +++ b/direct/src/showbase/ShadowDemo.py @@ -14,7 +14,7 @@ multitexture rendering techniques. It's not a particularly great way to do shadows. """ -from pandac.PandaModules import * +from panda3d.core import * from direct.task import Task sc = None diff --git a/direct/src/showbase/ShadowPlacer.py b/direct/src/showbase/ShadowPlacer.py index b0563d007c..80826926f7 100755 --- a/direct/src/showbase/ShadowPlacer.py +++ b/direct/src/showbase/ShadowPlacer.py @@ -12,7 +12,7 @@ the its parent node. from direct.controls.ControlManager import CollisionHandlerRayStart from direct.directnotify import DirectNotifyGlobal -from pandac.PandaModules import * +from panda3d.core import * from . import DirectObject class ShadowPlacer(DirectObject.DirectObject):