diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py
index 74cb07937f..29db4290bd 100644
--- a/direct/src/actor/Actor.py
+++ b/direct/src/actor/Actor.py
@@ -6,7 +6,7 @@ from panda3d.core import *
from panda3d.core import Loader as PandaLoader
from direct.showbase.DirectObject import DirectObject
from direct.directnotify import DirectNotifyGlobal
-import types
+
class Actor(DirectObject, NodePath):
"""
@@ -239,30 +239,30 @@ class Actor(DirectObject, NodePath):
# models{}{}, anims{}{} = multi-part actor w/ LOD
#
# make sure we have models
- if (models):
+ if models:
# do we have a dictionary of models?
- if (type(models)==type({})):
+ if type(models) == dict:
# if this is a dictionary of dictionaries
- if (type(models[models.keys()[0]]) == type({})):
+ if type(models[next(iter(models))]) == dict:
# then it must be a multipart actor w/LOD
self.setLODNode(node = lodNode)
# preserve numerical order for lod's
# this will make it easier to set ranges
- sortedKeys = models.keys()
+ sortedKeys = list(models.keys())
sortedKeys.sort()
for lodName in sortedKeys:
# make a node under the LOD switch
# for each lod (just because!)
self.addLOD(str(lodName))
# iterate over both dicts
- for modelName in models[lodName].keys():
+ for modelName in models[lodName]:
self.loadModel(models[lodName][modelName],
modelName, lodName, copy = copy,
okMissing = okMissing)
# then if there is a dictionary of dictionaries of anims
- elif (type(anims[anims.keys()[0]])==type({})):
+ elif type(anims[next(iter(anims))]) == dict:
# then this is a multipart actor w/o LOD
- for partName in models.keys():
+ for partName in models:
# pass in each part
self.loadModel(models[partName], partName,
copy = copy, okMissing = okMissing)
@@ -270,7 +270,7 @@ class Actor(DirectObject, NodePath):
# it is a single part actor w/LOD
self.setLODNode(node = lodNode)
# preserve order of LOD's
- sortedKeys = models.keys()
+ sortedKeys = list(models.keys())
sortedKeys.sort()
for lodName in sortedKeys:
self.addLOD(str(lodName))
@@ -283,28 +283,28 @@ class Actor(DirectObject, NodePath):
# load anims
# make sure the actor has animations
- if (anims):
- if (len(anims) >= 1):
+ if anims:
+ if len(anims) >= 1:
# if so, does it have a dictionary of dictionaries?
- if (type(anims[anims.keys()[0]])==type({})):
+ if type(anims[next(iter(anims))]) == dict:
# are the models a dict of dicts too?
- if (type(models)==type({})):
- if (type(models[models.keys()[0]]) == type({})):
+ if type(models) == dict:
+ if type(models[next(iter(models))]) == dict:
# then we have a multi-part w/ LOD
- sortedKeys = models.keys()
+ sortedKeys = list(models.keys())
sortedKeys.sort()
for lodName in sortedKeys:
# iterate over both dicts
- for partName in anims.keys():
+ for partName in anims:
self.loadAnims(
anims[partName], partName, lodName)
else:
# then it must be multi-part w/o LOD
- for partName in anims.keys():
+ for partName in anims:
self.loadAnims(anims[partName], partName)
- elif (type(models)==type({})):
+ elif type(models) == dict:
# then we have single-part w/ LOD
- sortedKeys = models.keys()
+ sortedKeys = list(models.keys())
sortedKeys.sort()
for lodName in sortedKeys:
self.loadAnims(anims, lodName=lodName)
@@ -431,11 +431,10 @@ class Actor(DirectObject, NodePath):
part.outputValue(lineStream)
value = lineStream.getLine()
- print ' ' * indentLevel, part.getName(), value
+ print(' '.join((' ' * indentLevel, part.getName(), value)))
- for i in range(part.getNumChildren()):
- self.__doListJoints(indentLevel + 2, part.getChild(i),
- isIncluded, subset)
+ for child in part.getChildren():
+ self.__doListJoints(indentLevel + 2, child, isIncluded, subset)
def getActorInfo(self):
@@ -449,14 +448,14 @@ class Actor(DirectObject, NodePath):
lodName = self.__sortedLODNames[0]
partInfo = []
- for partName in partDict.keys():
+ for partName in partDict:
subpartDef = self.__subpartDict.get(partName, Actor.SubpartDef(partName))
partBundleDict = self.__partBundleDict.get(lodName)
partDef = partBundleDict.get(subpartDef.truePartName)
partBundle = partDef.getBundle()
animDict = partDict[partName]
animInfo = []
- for animName in animDict.keys():
+ for animName in animDict:
file = animDict[animName].filename
animControl = animDict[animName].animControl
animInfo.append([animName, file, animControl])
@@ -478,17 +477,17 @@ class Actor(DirectObject, NodePath):
Pretty print actor's details
"""
for lodName, lodInfo in self.getActorInfo():
- print 'LOD:', lodName
+ print('LOD: %s' % lodName)
for partName, bundle, animInfo in lodInfo:
- print ' Part:', partName
- print ' Bundle:', repr(bundle)
+ print(' Part: %s' % partName)
+ print(' Bundle: %r' % bundle)
for animName, file, animControl in animInfo:
- print ' Anim:', animName
- print ' File:', file
+ print(' Anim: %s' % animName)
+ print(' File: %s' % file)
if animControl == None:
- print ' (not loaded)'
+ print(' (not loaded)')
else:
- print (' NumFrames: %d PlayRate: %0.2f' %
+ print(' NumFrames: %d PlayRate: %0.2f' %
(animControl.getNumFrames(),
animControl.getPlayRate()))
@@ -568,7 +567,7 @@ class Actor(DirectObject, NodePath):
def __updateSortedLODNames(self):
# Cache the sorted LOD names so we don't have to grab them
# and sort them every time somebody asks for the list
- self.__sortedLODNames = self.__partBundleDict.keys()
+ self.__sortedLODNames = list(self.__partBundleDict.keys())
# Reverse sort the doing a string->int
def sortKey(x):
if not str(x).isdigit():
@@ -604,8 +603,8 @@ class Actor(DirectObject, NodePath):
"""
partNames = []
if self.__partBundleDict:
- partNames = self.__partBundleDict.values()[0].keys()
- return partNames + self.__subpartDict.keys()
+ partNames = list(next(iter(self.__partBundleDict.values())).keys())
+ return partNames + list(self.__subpartDict.keys())
def getGeomNode(self):
"""
@@ -646,33 +645,33 @@ class Actor(DirectObject, NodePath):
"""
# make sure we don't call this twice in a row
# and pollute the the switches dictionary
-## sortedKeys = self.switches.keys()
+## sortedKeys = list(self.switches.keys())
## sortedKeys.sort()
child = self.__LODNode.find(str(lodName))
index = self.__LODNode.node().findChild(child.node())
self.__LODNode.node().forceSwitch(index)
def printLOD(self):
-## sortedKeys = self.switches.keys()
+## sortedKeys = list(self.switches.keys())
## sortedKeys.sort()
sortedKeys = self.__sortedLODNames
for eachLod in sortedKeys:
- print "python switches for %s: in: %d, out %d" % (eachLod,
+ print("python switches for %s: in: %d, out %d" % (eachLod,
self.switches[eachLod][0],
- self.switches[eachLod][1])
+ self.switches[eachLod][1]))
switchNum = self.__LODNode.node().getNumSwitches()
for eachSwitch in range(0, switchNum):
- print "c++ switches for %d: in: %d, out: %d" % (eachSwitch,
+ print("c++ switches for %d: in: %d, out: %d" % (eachSwitch,
self.__LODNode.node().getIn(eachSwitch),
- self.__LODNode.node().getOut(eachSwitch))
+ self.__LODNode.node().getOut(eachSwitch)))
def resetLOD(self):
"""
Restore all switch distance info (usually after a useLOD call)"""
self.__LODNode.node().clearForceSwitch()
-## sortedKeys = self.switches.keys()
+## sortedKeys = list(self.switches.keys())
## sortedKeys.sort()
## for eachLod in sortedKeys:
## index = sortedKeys.index(eachLod)
@@ -699,7 +698,7 @@ class Actor(DirectObject, NodePath):
# save the switch distance info
self.switches[lodName] = [inDist, outDist]
# add the switch distance info
-## sortedKeys = self.switches.keys()
+## sortedKeys = list(self.switches.keys())
## sortedKeys.sort()
self.__LODNode.node().setSwitch(self.getLODIndex(lodName), inDist, outDist)
@@ -798,7 +797,7 @@ class Actor(DirectObject, NodePath):
lodName = lodNames[lod]
if partName == None:
partBundleDict = self.__partBundleDict[lodName]
- partNames = partBundleDict.keys()
+ partNames = list(partBundleDict.keys())
else:
partNames = [partName]
@@ -822,7 +821,7 @@ class Actor(DirectObject, NodePath):
If no part specified, return anim durations of first part.
NOTE: returns info only for an arbitrary LOD
"""
- lodName = self.__animControlDict.keys()[0]
+ lodName = next(iter(self.__animControlDict))
controls = self.getAnimControls(animName, partName)
if len(controls) == 0:
return None
@@ -834,7 +833,7 @@ class Actor(DirectObject, NodePath):
Return frame rate of given anim name and given part, unmodified
by any play rate in effect.
"""
- lodName = self.__animControlDict.keys()[0]
+ lodName = next(iter(self.__animControlDict))
controls = self.getAnimControls(animName, partName)
if len(controls) == 0:
return None
@@ -850,7 +849,7 @@ class Actor(DirectObject, NodePath):
"""
if self.__animControlDict:
# use the first lod
- lodName = self.__animControlDict.keys()[0]
+ lodName = next(iter(self.__animControlDict))
controls = self.getAnimControls(animName, partName)
if controls:
return controls[0].getPlayRate()
@@ -877,7 +876,7 @@ class Actor(DirectObject, NodePath):
If no part specified, return anim duration of first part.
NOTE: returns info for arbitrary LOD
"""
- lodName = self.__animControlDict.keys()[0]
+ lodName = next(iter(self.__animControlDict))
controls = self.getAnimControls(animName, partName)
if len(controls) == 0:
return None
@@ -890,7 +889,7 @@ class Actor(DirectObject, NodePath):
return ((toFrame+1)-fromFrame) / animControl.getFrameRate()
def getNumFrames(self, animName=None, partName=None):
- lodName = self.__animControlDict.keys()[0]
+ lodName = next(iter(self.__animControlDict))
controls = self.getAnimControls(animName, partName)
if len(controls) == 0:
return None
@@ -908,12 +907,12 @@ class Actor(DirectObject, NodePath):
specified return current anim of an arbitrary part in dictionary.
NOTE: only returns info for an arbitrary LOD
"""
- if len(self.__animControlDict.items()) == 0:
+ if len(self.__animControlDict) == 0:
return
- lodName, animControlDict = self.__animControlDict.items()[0]
+ lodName, animControlDict = next(iter(self.__animControlDict.items()))
if partName == None:
- partName, animDict = animControlDict.items()[0]
+ partName, animDict = next(iter(animControlDict.items()))
else:
animDict = animControlDict.get(partName)
if animDict == None:
@@ -936,9 +935,9 @@ class Actor(DirectObject, NodePath):
actor. If part not specified return current anim of first part
in dictionary. NOTE: only returns info for an arbitrary LOD
"""
- lodName, animControlDict = self.__animControlDict.items()[0]
+ lodName, animControlDict = next(iter(self.__animControlDict.items()))
if partName == None:
- partName, animDict = animControlDict.items()[0]
+ partName, animDict = next(iter(animControlDict.items()))
else:
animDict = animControlDict.get(partName)
if animDict == None:
@@ -1420,17 +1419,15 @@ class Actor(DirectObject, NodePath):
if mode > 0:
# Use the 'fixed' bin instead of reordering the scene
# graph.
- numFrontParts = frontParts.getNumPaths()
- for partNum in range(0, numFrontParts):
- frontParts[partNum].setBin('fixed', mode)
+ for part in frontParts:
+ part.setBin('fixed', mode)
return
if mode == -2:
# Turn off depth test/write on the frontParts.
- numFrontParts = frontParts.getNumPaths()
- for partNum in range(0, numFrontParts):
- frontParts[partNum].setDepthWrite(0)
- frontParts[partNum].setDepthTest(0)
+ for part in frontParts:
+ part.setDepthWrite(0)
+ part.setDepthTest(0)
# Find the back part.
backPart = root.find("**/" + backPartName)
@@ -1457,12 +1454,8 @@ class Actor(DirectObject, NodePath):
char = partData.partBundleNP
char.node().update()
geomNodes = char.findAllMatches("**/+GeomNode")
- numGeomNodes = geomNodes.getNumPaths()
- for nodeNum in xrange(numGeomNodes):
- thisGeomNode = geomNodes.getPath(nodeNum)
- numGeoms = thisGeomNode.node().getNumGeoms()
- for geomNum in xrange(numGeoms):
- thisGeom = thisGeomNode.node().getGeom(geomNum)
+ for thisGeomNode in geomNodes:
+ for thisGeom in thisGeomNode.node().getGeoms():
thisGeom.markBoundsStale()
thisGeomNode.node().markInternalBoundsStale()
else:
@@ -1473,12 +1466,8 @@ class Actor(DirectObject, NodePath):
char = partData.partBundleNP
char.node().update()
geomNodes = char.findAllMatches("**/+GeomNode")
- numGeomNodes = geomNodes.getNumPaths()
- for nodeNum in xrange(numGeomNodes):
- thisGeomNode = geomNodes.getPath(nodeNum)
- numGeoms = thisGeomNode.node().getNumGeoms()
- for geomNum in xrange(numGeoms):
- thisGeom = thisGeomNode.node().getGeom(geomNum)
+ for thisGeomNode in geomNodes:
+ for thisGeom in thisGeomNode.node().getGeoms():
thisGeom.markBoundsStale()
thisGeomNode.node().markInternalBoundsStale()
@@ -1494,19 +1483,14 @@ class Actor(DirectObject, NodePath):
# update all characters first
charNodes = part.findAllMatches("**/+Character")
- numCharNodes = charNodes.getNumPaths()
- for charNum in range(0, numCharNodes):
- (charNodes.getPath(charNum)).node().update()
+ for charNode in charNodes:
+ charNode.node().update()
# for each geomNode, iterate through all geoms and force update
# of bounding spheres by marking current bounds as stale
geomNodes = part.findAllMatches("**/+GeomNode")
- numGeomNodes = geomNodes.getNumPaths()
- for nodeNum in range(0, numGeomNodes):
- thisGeomNode = geomNodes.getPath(nodeNum)
- numGeoms = thisGeomNode.node().getNumGeoms()
- for geomNum in range(0, numGeoms):
- thisGeom = thisGeomNode.node().getGeom(geomNum)
+ for nodeNum, thisGeomNode in enumerate(geomNodes):
+ for geomNum, thisGeom in enumerate(thisGeomNode.node().getGeoms()):
thisGeom.markBoundsStale()
assert Actor.notify.debug("fixing bounds for node %s, geom %s" % \
(nodeNum, geomNum))
@@ -1517,20 +1501,18 @@ class Actor(DirectObject, NodePath):
Show the bounds of all actor geoms
"""
geomNodes = self.__geomNode.findAllMatches("**/+GeomNode")
- numGeomNodes = geomNodes.getNumPaths()
- for nodeNum in range(0, numGeomNodes):
- geomNodes.getPath(nodeNum).showBounds()
+ for node in geomNodes:
+ node.showBounds()
def hideAllBounds(self):
"""
Hide the bounds of all actor geoms
"""
geomNodes = self.__geomNode.findAllMatches("**/+GeomNode")
- numGeomNodes = geomNodes.getNumPaths()
- for nodeNum in range(0, numGeomNodes):
- geomNodes.getPath(nodeNum).hideBounds()
+ for node in geomNodes:
+ node.hideBounds()
# actions
@@ -1698,7 +1680,7 @@ class Actor(DirectObject, NodePath):
if self.mergeLODBundles:
lodName = 'common'
elif self.switches:
- lodName = str(self.switches.keys()[0])
+ lodName = str(next(iter(self.switches)))
else:
lodName = 'lodRoot'
@@ -1723,7 +1705,7 @@ class Actor(DirectObject, NodePath):
lodName = 'common'
elif not lodName:
if self.switches:
- lodName = str(self.switches.keys()[0])
+ lodName = str(next(iter(self.switches)))
else:
lodName = 'lodRoot'
@@ -1777,7 +1759,7 @@ class Actor(DirectObject, NodePath):
# If we have the __subpartsComplete flag, and no partName
# is specified, it really means to play the animation on
# all subparts, not on the overall Actor.
- partName = self.__subpartDict.keys()
+ partName = list(self.__subpartDict.keys())
controls = []
# build list of lodNames and corresponding animControlDicts
@@ -1805,7 +1787,7 @@ class Actor(DirectObject, NodePath):
else:
# Get exactly the named part or parts.
- if isinstance(partName, types.StringTypes):
+ if isinstance(partName, str):
partNameList = [partName]
else:
partNameList = partName
@@ -1835,7 +1817,7 @@ class Actor(DirectObject, NodePath):
controls.append(anim.animControl)
else:
# get the named animation(s) only.
- if isinstance(animName, types.StringTypes):
+ if isinstance(animName, str):
# A single animName
animNameList = [animName]
else:
@@ -2107,7 +2089,7 @@ class Actor(DirectObject, NodePath):
if lodName:
partNames = self.__partBundleDict[lodName].keys()
else:
- partNames = self.__partBundleDict.values()[0].keys()
+ partNames = next(iter(self.__partBundleDict.values())).keys()
for partName in partNames:
subJoints = set()
@@ -2133,9 +2115,9 @@ class Actor(DirectObject, NodePath):
lodNames = ['common']
elif lodName == 'all':
reload = False
- lodNames = self.switches.keys()
+ lodNames = list(self.switches.keys())
lodNames.sort()
- for i in range(0,len(lodNames)):
+ for i in range(0, len(lodNames)):
lodNames[i] = str(lodNames[i])
else:
lodNames = [lodName]
@@ -2256,20 +2238,20 @@ class Actor(DirectObject, NodePath):
assert Actor.notify.debug("in unloadAnims: %s, part: %s, lod: %s" %
(anims, partName, lodName))
- if lodName == None or self.mergeLODBundles:
+ if lodName is None or self.mergeLODBundles:
lodNames = self.__animControlDict.keys()
else:
lodNames = [lodName]
- if (partName == None):
+ if partName is None:
if len(lodNames) > 0:
- partNames = self.__animControlDict[lodNames[0]].keys()
+ partNames = self.__animControlDict[next(iter(lodNames))].keys()
else:
partNames = []
else:
partNames = [partName]
- if (anims==None):
+ if anims is None:
for lodName in lodNames:
for partName in partNames:
for animDef in self.__animControlDict[lodName][partName].values():
@@ -2400,7 +2382,7 @@ class Actor(DirectObject, NodePath):
Copy the part bundle dictionary from another actor as this
instance's own. NOTE: this method does not actually copy geometry
"""
- for lodName in other.__partBundleDict.keys():
+ for lodName in other.__partBundleDict:
# find the lod Asad
if lodName == 'lodRoot':
partLod = self
@@ -2445,11 +2427,11 @@ class Actor(DirectObject, NodePath):
assert(other.mergeLODBundles == self.mergeLODBundles)
- for lodName in other.__animControlDict.keys():
+ for lodName in other.__animControlDict:
self.__animControlDict[lodName] = {}
- for partName in other.__animControlDict[lodName].keys():
+ for partName in other.__animControlDict[lodName]:
self.__animControlDict[lodName][partName] = {}
- for animName in other.__animControlDict[lodName][partName].keys():
+ for animName in other.__animControlDict[lodName][partName]:
anim = other.__animControlDict[lodName][partName][animName]
anim = anim.makeCopy()
self.__animControlDict[lodName][partName][animName] = anim
@@ -2512,13 +2494,13 @@ class Actor(DirectObject, NodePath):
def printAnimBlends(self, animName=None, partName=None, lodName=None):
for lodName, animList in self.getAnimBlends(animName, partName, lodName):
- print 'LOD %s:' % (lodName)
+ print('LOD %s:' % (lodName))
for animName, blendList in animList:
list = []
for partName, effect in blendList:
list.append('%s:%.3f' % (partName, effect))
- print ' %s: %s' % (animName, ', '.join(list))
+ print(' %s: %s' % (animName, ', '.join(list)))
def osdAnimBlends(self, animName=None, partName=None, lodName=None):
if not onScreenDebug.enabled:
@@ -2565,5 +2547,5 @@ class Actor(DirectObject, NodePath):
def renamePartBundles(self, partName, newBundleName):
subpartDef = self.__subpartDict.get(partName, Actor.SubpartDef(partName))
for partBundleDict in self.__partBundleDict.values():
- partDef=partBundleDict.get(subpartDef.truePartName)
+ partDef = partBundleDict.get(subpartDef.truePartName)
partDef.getBundle().setName(newBundleName)
diff --git a/direct/src/actor/DistributedActor.py b/direct/src/actor/DistributedActor.py
index 2e991d2043..c46a8863c4 100644
--- a/direct/src/actor/DistributedActor.py
+++ b/direct/src/actor/DistributedActor.py
@@ -4,7 +4,7 @@ __all__ = ['DistributedActor']
from direct.distributed import DistributedNode
-import Actor
+from . import Actor
class DistributedActor(DistributedNode.DistributedNode, Actor.Actor):
def __init__(self, cr):
diff --git a/direct/src/cluster/ClusterClient.py b/direct/src/cluster/ClusterClient.py
index f238aca91d..873b03d4ea 100644
--- a/direct/src/cluster/ClusterClient.py
+++ b/direct/src/cluster/ClusterClient.py
@@ -1,8 +1,8 @@
"""ClusterClient: Master for mutli-piping or PC clusters. """
from panda3d.core import *
-from ClusterMsgs import *
-from ClusterConfig import *
+from .ClusterMsgs import *
+from .ClusterConfig import *
from direct.directnotify import DirectNotifyGlobal
from direct.showbase import DirectObject
from direct.task import Task
@@ -44,10 +44,10 @@ class ClusterClient(DirectObject.DirectObject):
self.daemon.tellServer(serverConfig.serverName,
serverConfig.serverDaemonPort,
serverCommand)
- print 'Begin waitForServers'
+ print('Begin waitForServers')
if not self.daemon.waitForServers(len(configList)):
- print 'Cluster Client, no response from servers'
- print 'End waitForServers'
+ print('Cluster Client, no response from servers')
+ print('End waitForServers')
self.qcm=QueuedConnectionManager()
self.serverList = []
self.serverQueues = []
@@ -262,9 +262,8 @@ class ClusterClient(DirectObject.DirectObject):
def getNodePathFindCmd(self, nodePath):
- import string
pathString = repr(nodePath)
- index = string.find(pathString, '/')
+ index = pathString.find('/')
if index != -1:
rootName = pathString[:index]
searchString = pathString[index+1:]
@@ -273,9 +272,8 @@ class ClusterClient(DirectObject.DirectObject):
return rootName
def getNodePathName(self, nodePath):
- import string
pathString = repr(nodePath)
- index = string.find(pathString, '/')
+ index = pathString.find('/')
if index != -1:
name = pathString[index+1:]
return name
@@ -409,7 +407,7 @@ class ClusterClientSync(ClusterClient):
#I probably don't need this
self.waitForSwap = 0
self.ready = 0
- print "creating synced client"
+ print("creating synced client")
self.startSwapCoordinatorTask()
def startSwapCoordinatorTask(self):
diff --git a/direct/src/cluster/ClusterConfig.py b/direct/src/cluster/ClusterConfig.py
index 6cf71dcaab..73e4ebf2b6 100644
--- a/direct/src/cluster/ClusterConfig.py
+++ b/direct/src/cluster/ClusterConfig.py
@@ -1,5 +1,5 @@
-from ClusterClient import *
+from .ClusterClient import *
# A dictionary of information for various cluster configurations.
# Dictionary is keyed on cluster-config string
diff --git a/direct/src/cluster/ClusterServer.py b/direct/src/cluster/ClusterServer.py
index 4ec78b0841..511dc84cef 100644
--- a/direct/src/cluster/ClusterServer.py
+++ b/direct/src/cluster/ClusterServer.py
@@ -1,5 +1,5 @@
from panda3d.core import *
-from ClusterMsgs import *
+from .ClusterMsgs import *
from direct.distributed.MsgTypes import *
from direct.directnotify import DirectNotifyGlobal
from direct.showbase import DirectObject
@@ -246,7 +246,7 @@ class ClusterServer(DirectObject.DirectObject):
if (type == CLUSTER_NONE):
pass
elif (type == CLUSTER_EXIT):
- print 'GOT EXIT'
+ print('GOT EXIT')
import sys
sys.exit()
elif (type == CLUSTER_CAM_OFFSET):
diff --git a/direct/src/controls/BattleWalker.py b/direct/src/controls/BattleWalker.py
index 8b6e634e25..a26beb4103 100755
--- a/direct/src/controls/BattleWalker.py
+++ b/direct/src/controls/BattleWalker.py
@@ -2,7 +2,7 @@
from direct.showbase.InputStateGlobal import inputState
from direct.task.Task import Task
from pandac.PandaModules import *
-import GravityWalker
+from . import GravityWalker
BattleStrafe = 0
@@ -166,7 +166,7 @@ class BattleWalker(GravityWalker.GravityWalker):
# Should fSlide be renamed slideButton?
self.slideSpeed=.15*(turnLeft and -self.avatarControlForwardSpeed or
turnRight and self.avatarControlForwardSpeed)
- print 'slideSpeed: ', self.slideSpeed
+ print('slideSpeed: %s' % self.slideSpeed)
self.rotationSpeed=0
self.speed=0
@@ -233,7 +233,7 @@ class BattleWalker(GravityWalker.GravityWalker):
if self.moving:
distance = dt * self.speed
slideDistance = dt * self.slideSpeed
- print 'slideDistance: ', slideDistance
+ print('slideDistance: %s' % slideDistance)
rotation = dt * self.rotationSpeed
# Take a step in the direction of our previous heading.
diff --git a/direct/src/controls/GhostWalker.py b/direct/src/controls/GhostWalker.py
index 8dd36f2450..4badbf7258 100755
--- a/direct/src/controls/GhostWalker.py
+++ b/direct/src/controls/GhostWalker.py
@@ -15,7 +15,7 @@ animations based on walker events.
"""
from direct.directnotify import DirectNotifyGlobal
-import NonPhysicsWalker
+from . import NonPhysicsWalker
class GhostWalker(NonPhysicsWalker.NonPhysicsWalker):
diff --git a/direct/src/controls/ObserverWalker.py b/direct/src/controls/ObserverWalker.py
index efc9c4b0f9..f93e0e3325 100755
--- a/direct/src/controls/ObserverWalker.py
+++ b/direct/src/controls/ObserverWalker.py
@@ -16,7 +16,7 @@ animations based on walker events.
from panda3d.core import *
from direct.directnotify import DirectNotifyGlobal
-import NonPhysicsWalker
+from . import NonPhysicsWalker
class ObserverWalker(NonPhysicsWalker.NonPhysicsWalker):
notify = DirectNotifyGlobal.directNotify.newCategory("ObserverWalker")
diff --git a/direct/src/controls/PhysicsWalker.py b/direct/src/controls/PhysicsWalker.py
index b0a0cdfcb8..fc6fe1ca70 100755
--- a/direct/src/controls/PhysicsWalker.py
+++ b/direct/src/controls/PhysicsWalker.py
@@ -324,7 +324,7 @@ class PhysicsWalker(DirectObject.DirectObject):
indicator.instanceTo(contactIndicatorNode)
self.physContactIndicator=contactIndicatorNode
else:
- print "failed load of physics indicator"
+ print("failed load of physics indicator")
def avatarPhysicsIndicator(self, task):
#assert self.debugPrint("avatarPhysicsIndicator()")
@@ -710,7 +710,7 @@ class PhysicsWalker(DirectObject.DirectObject):
def setPriorParentVector(self):
assert self.debugPrint("doDeltaPos()")
- print "self.__oldDt", self.__oldDt, "self.__oldPosDelta", self.__oldPosDelta
+ print("self.__oldDt %s self.__oldPosDelta %s" % (self.__oldDt, self.__oldPosDelta))
if __debug__:
onScreenDebug.add("__oldDt", "% 10.4f"%self.__oldDt)
onScreenDebug.add("self.__oldPosDelta",
diff --git a/direct/src/controls/TwoDWalker.py b/direct/src/controls/TwoDWalker.py
index d80f90bf4d..b99f6db11b 100644
--- a/direct/src/controls/TwoDWalker.py
+++ b/direct/src/controls/TwoDWalker.py
@@ -2,7 +2,7 @@
TwoDWalker.py is for controling the avatars in a 2D Scroller game environment.
"""
-from GravityWalker import *
+from .GravityWalker import *
from panda3d.core import ConfigVariableBool
diff --git a/direct/src/directbase/ThreeUpStart.py b/direct/src/directbase/ThreeUpStart.py
index 3d1784408f..b0a78fcef9 100644
--- a/direct/src/directbase/ThreeUpStart.py
+++ b/direct/src/directbase/ThreeUpStart.py
@@ -1,5 +1,5 @@
-print 'ThreeUpStart: Starting up environment.'
+print('ThreeUpStart: Starting up environment.')
from pandac.PandaModules import *
diff --git a/direct/src/directdevices/DirectFastrak.py b/direct/src/directdevices/DirectFastrak.py
index 4f046329a0..c6e30bd8fc 100644
--- a/direct/src/directdevices/DirectFastrak.py
+++ b/direct/src/directdevices/DirectFastrak.py
@@ -1,7 +1,7 @@
""" Class used to create and control radamec device """
from math import *
from direct.showbase.DirectObject import DirectObject
-from DirectDeviceManager import *
+from .DirectDeviceManager import *
from direct.directnotify import DirectNotifyGlobal
diff --git a/direct/src/directdevices/DirectJoybox.py b/direct/src/directdevices/DirectJoybox.py
index 7376154947..60c4c4211b 100644
--- a/direct/src/directdevices/DirectJoybox.py
+++ b/direct/src/directdevices/DirectJoybox.py
@@ -1,6 +1,6 @@
""" Class used to create and control joybox device """
from direct.showbase.DirectObject import DirectObject
-from DirectDeviceManager import *
+from .DirectDeviceManager import *
from direct.directtools.DirectUtil import *
from direct.gui import OnscreenText
from direct.task import Task
diff --git a/direct/src/directdevices/DirectRadamec.py b/direct/src/directdevices/DirectRadamec.py
index 2f9a2495f1..2aa7b1933c 100644
--- a/direct/src/directdevices/DirectRadamec.py
+++ b/direct/src/directdevices/DirectRadamec.py
@@ -1,7 +1,7 @@
""" Class used to create and control radamec device """
from math import *
from direct.showbase.DirectObject import DirectObject
-from DirectDeviceManager import *
+from .DirectDeviceManager import *
from direct.directnotify import DirectNotifyGlobal
diff --git a/direct/src/directnotify/DirectNotify.py b/direct/src/directnotify/DirectNotify.py
index 96f79f57a3..14a712bd40 100644
--- a/direct/src/directnotify/DirectNotify.py
+++ b/direct/src/directnotify/DirectNotify.py
@@ -2,8 +2,8 @@
DirectNotify module: this module contains the DirectNotify class
"""
-import Notifier
-import Logger
+from . import Notifier
+from . import Logger
class DirectNotify:
"""
@@ -35,7 +35,7 @@ class DirectNotify:
"""
Return list of category dictionary keys
"""
- return (self.__categories.keys())
+ return list(self.__categories.keys())
def getCategory(self, categoryName):
"""getCategory(self, string)
@@ -97,7 +97,7 @@ class DirectNotify:
category.setInfo(1)
category.setDebug(1)
else:
- print ("DirectNotify: unknown notify level: " + str(level)
+ print("DirectNotify: unknown notify level: " + str(level)
+ " for category: " + str(categoryName))
diff --git a/direct/src/directnotify/DirectNotifyGlobal.py b/direct/src/directnotify/DirectNotifyGlobal.py
index 353b3d48f7..e25ddb11ad 100644
--- a/direct/src/directnotify/DirectNotifyGlobal.py
+++ b/direct/src/directnotify/DirectNotifyGlobal.py
@@ -2,7 +2,7 @@
__all__ = ['directNotify', 'giveNotify']
-import DirectNotify
+from . import DirectNotify
directNotify = DirectNotify.DirectNotify()
giveNotify = directNotify.giveNotify
diff --git a/direct/src/directnotify/LoggerGlobal.py b/direct/src/directnotify/LoggerGlobal.py
index 87a89e446d..610a009a8f 100644
--- a/direct/src/directnotify/LoggerGlobal.py
+++ b/direct/src/directnotify/LoggerGlobal.py
@@ -1,5 +1,5 @@
"""instantiate global Logger object"""
-import Logger
+from . import Logger
defaultLogger = Logger.Logger()
diff --git a/direct/src/directnotify/Notifier.py b/direct/src/directnotify/Notifier.py
index a0dcc511ad..35a916f8b3 100644
--- a/direct/src/directnotify/Notifier.py
+++ b/direct/src/directnotify/Notifier.py
@@ -2,7 +2,7 @@
Notifier module: contains methods for handling information output
for the programmer/user
"""
-from LoggerGlobal import defaultLogger
+from .LoggerGlobal import defaultLogger
from direct.showbase import PythonUtil
from panda3d.core import ConfigVariableBool, NotifyCategory, StreamWriter, Notify
import time
@@ -237,7 +237,7 @@ class Notifier:
if self.streamWriter:
self.streamWriter.write(string + '\n')
else:
- print >> sys.stderr, string
+ sys.stderr.write(string + '\n')
def debugStateCall(self, obj=None, fsmMemberName='fsm',
secondaryFsm='secondaryFSM'):
diff --git a/direct/src/directnotify/RotatingLog.py b/direct/src/directnotify/RotatingLog.py
index caf7bbd527..e663da67ac 100755
--- a/direct/src/directnotify/RotatingLog.py
+++ b/direct/src/directnotify/RotatingLog.py
@@ -91,7 +91,7 @@ class RotatingLog:
self.timeLimit=time.time()+self.timeInterval
else:
# We'll keep writing to the old file, if available.
- print "RotatingLog error: Unable to open new log file \"%s\"."%(path,)
+ print("RotatingLog error: Unable to open new log file \"%s\"." % (path,))
def write(self, data):
"""
@@ -115,8 +115,9 @@ class RotatingLog:
def isatty(self):
return self.file.isatty()
- def next(self):
- return self.file.next()
+ def __next__(self):
+ return next(self.file)
+ next = __next__
def read(self, size):
return self.file.read(size)
diff --git a/direct/src/directscripts/eggcacher.py b/direct/src/directscripts/eggcacher.py
index ea2f653876..ebef394890 100644
--- a/direct/src/directscripts/eggcacher.py
+++ b/direct/src/directscripts/eggcacher.py
@@ -19,8 +19,8 @@ class EggCacher:
self.pandaloader = Loader()
self.loaderopts = LoaderOptions(LoaderOptions.LF_no_ram_cache)
if (self.bamcache.getActive() == 0):
- print "The model cache is not currently active."
- print "You must set a model-cache-dir in your config file."
+ print("The model cache is not currently active.")
+ print("You must set a model-cache-dir in your config file.")
sys.exit(1)
self.parseArgs(args)
files = self.scanPaths(self.paths)
@@ -39,13 +39,13 @@ class EggCacher:
else:
break
if (len(args) < 1):
- print "Usage: eggcacher options file-or-directory"
+ print("Usage: eggcacher options file-or-directory")
sys.exit(1)
self.paths = args
def scanPath(self, eggs, path):
if (os.path.exists(path)==0):
- print "No such file or directory: "+path
+ print("No such file or directory: " + path)
return
if (os.path.isdir(path)):
for f in os.listdir(path):
@@ -78,7 +78,7 @@ class EggCacher:
percent = (progress * 100) / total
report = path
if (self.concise): report = os.path.basename(report)
- print "Preprocessing Models %2d%% %s" % (percent, report)
+ print("Preprocessing Models %2d%% %s" % (percent, report))
sys.stdout.flush()
if (cached) and (cached.hasData()==0):
self.pandaloader.loadSync(fn, self.loaderopts)
diff --git a/direct/src/directscripts/extract_docs.py b/direct/src/directscripts/extract_docs.py
index 8e291f95ae..b6ad69e946 100644
--- a/direct/src/directscripts/extract_docs.py
+++ b/direct/src/directscripts/extract_docs.py
@@ -5,6 +5,8 @@ You need to run this before invoking Doxyfile.python.
It requires a valid makepanda installation with interrogatedb .in
files in the lib/pandac/input directory. """
+from __future__ import print_function
+
__all__ = []
import os
@@ -156,61 +158,61 @@ def translated_type_name(type, scoped=True):
def processElement(handle, element):
if interrogate_element_has_comment(element):
- print >>handle, comment(interrogate_element_comment(element))
+ print(comment(interrogate_element_comment(element)), file=handle)
- print >>handle, translated_type_name(interrogate_element_type(element)),
- print >>handle, interrogate_element_name(element) + ';'
+ print(translated_type_name(interrogate_element_type(element)), end=' ', file=handle)
+ print(interrogate_element_name(element) + ';', file=handle)
def processFunction(handle, function, isConstructor = False):
- for i_wrapper in xrange(interrogate_function_number_of_python_wrappers(function)):
+ for i_wrapper in range(interrogate_function_number_of_python_wrappers(function)):
wrapper = interrogate_function_python_wrapper(function, i_wrapper)
if interrogate_wrapper_has_comment(wrapper):
- print >>handle, block_comment(interrogate_wrapper_comment(wrapper))
+ print(block_comment(interrogate_wrapper_comment(wrapper)), file=handle)
if not isConstructor:
if interrogate_function_is_method(function):
if not interrogate_wrapper_number_of_parameters(wrapper) > 0 or not interrogate_wrapper_parameter_is_this(wrapper, 0):
- print >>handle, "static",
+ print("static", end=' ', file=handle)
if interrogate_wrapper_has_return_value(wrapper):
- print >>handle, translated_type_name(interrogate_wrapper_return_type(wrapper)),
+ print(translated_type_name(interrogate_wrapper_return_type(wrapper)), end=' ', file=handle)
else:
pass#print >>handle, "void",
- print >>handle, translateFunctionName(interrogate_function_name(function)) + "(",
+ print(translateFunctionName(interrogate_function_name(function)) + "(", end=' ', file=handle)
else:
- print >>handle, "__init__(",
+ print("__init__(", end=' ', file=handle)
first = True
for i_param in range(interrogate_wrapper_number_of_parameters(wrapper)):
if not interrogate_wrapper_parameter_is_this(wrapper, i_param):
if not first:
- print >>handle, ",",
- print >>handle, translated_type_name(interrogate_wrapper_parameter_type(wrapper, i_param)),
+ print(",", end=' ', file=handle)
+ print(translated_type_name(interrogate_wrapper_parameter_type(wrapper, i_param)), end=' ', file=handle)
if interrogate_wrapper_parameter_has_name(wrapper, i_param):
- print >>handle, interrogate_wrapper_parameter_name(wrapper, i_param),
+ print(interrogate_wrapper_parameter_name(wrapper, i_param), end=' ', file=handle)
first = False
- print >>handle, ");"
+ print(");", file=handle)
def processType(handle, type):
typename = translated_type_name(type, scoped=False)
derivations = [ translated_type_name(interrogate_type_get_derivation(type, n)) for n in range(interrogate_type_number_of_derivations(type)) ]
if interrogate_type_has_comment(type):
- print >>handle, block_comment(interrogate_type_comment(type))
+ print(block_comment(interrogate_type_comment(type)), file=handle)
if interrogate_type_is_enum(type):
- print >>handle, "enum %s {" % typename
+ print("enum %s {" % typename, file=handle)
for i_value in range(interrogate_type_number_of_enum_values(type)):
docstring = comment(interrogate_type_enum_value_comment(type, i_value))
if docstring:
- print >>handle, docstring
- print >>handle, interrogate_type_enum_value_name(type, i_value), "=", interrogate_type_enum_value(type, i_value), ","
+ print(docstring, file=handle)
+ print(interrogate_type_enum_value_name(type, i_value), "=", interrogate_type_enum_value(type, i_value), ",", file=handle)
elif interrogate_type_is_typedef(type):
wrapped_type = translated_type_name(interrogate_type_wrapped_type(type))
- print >>handle, "typedef %s %s;" % (wrapped_type, typename)
+ print("typedef %s %s;" % (wrapped_type, typename), file=handle)
return
else:
if interrogate_type_is_struct(type):
@@ -220,39 +222,39 @@ def processType(handle, type):
elif interrogate_type_is_union(type):
classtype = "union"
else:
- print "I don't know what type %s is" % interrogate_type_true_name(type)
+ print("I don't know what type %s is" % interrogate_type_true_name(type))
return
if len(derivations) > 0:
- print >>handle, "%s %s : public %s {" % (classtype, typename, ", public ".join(derivations))
+ print("%s %s : public %s {" % (classtype, typename, ", public ".join(derivations)), file=handle)
else:
- print >>handle, "%s %s {" % (classtype, typename)
- print >>handle, "public:"
+ print("%s %s {" % (classtype, typename), file=handle)
+ print("public:", file=handle)
- for i_ntype in xrange(interrogate_type_number_of_nested_types(type)):
+ for i_ntype in range(interrogate_type_number_of_nested_types(type)):
processType(handle, interrogate_type_get_nested_type(type, i_ntype))
- for i_method in xrange(interrogate_type_number_of_constructors(type)):
+ for i_method in range(interrogate_type_number_of_constructors(type)):
processFunction(handle, interrogate_type_get_constructor(type, i_method), True)
- for i_method in xrange(interrogate_type_number_of_methods(type)):
+ for i_method in range(interrogate_type_number_of_methods(type)):
processFunction(handle, interrogate_type_get_method(type, i_method))
- for i_method in xrange(interrogate_type_number_of_make_seqs(type)):
- print >>handle, "list", translateFunctionName(interrogate_make_seq_seq_name(interrogate_type_get_make_seq(type, i_method))), "();"
+ for i_method in range(interrogate_type_number_of_make_seqs(type)):
+ print("list", translateFunctionName(interrogate_make_seq_seq_name(interrogate_type_get_make_seq(type, i_method))), "();", file=handle)
- for i_element in xrange(interrogate_type_number_of_elements(type)):
+ for i_element in range(interrogate_type_number_of_elements(type)):
processElement(handle, interrogate_type_get_element(type, i_element))
- print >>handle, "};"
+ print("};", file=handle)
def processModule(handle, package):
- print >>handle, "namespace %s {" % package
+ print("namespace %s {" % package, file=handle)
if package != "core":
- print >>handle, "using namespace core;"
+ print("using namespace core;", file=handle)
- for i_type in xrange(interrogate_number_of_global_types()):
+ for i_type in range(interrogate_number_of_global_types()):
type = interrogate_get_global_type(i_type)
if interrogate_type_has_module_name(type):
@@ -260,9 +262,9 @@ def processModule(handle, package):
if "panda3d." + package == module_name:
processType(handle, type)
else:
- print "Type %s has no module name" % typename
+ print("Type %s has no module name" % typename)
- for i_func in xrange(interrogate_number_of_global_functions()):
+ for i_func in range(interrogate_number_of_global_functions()):
func = interrogate_get_global_function(i_func)
if interrogate_function_has_module_name(func):
@@ -270,16 +272,16 @@ def processModule(handle, package):
if "panda3d." + package == module_name:
processFunction(handle, func)
else:
- print "Type %s has no module name" % typename
+ print("Type %s has no module name" % typename)
- print >>handle, "}"
+ print("}", file=handle)
if __name__ == "__main__":
handle = open("pandadoc.hpp", "w")
- print >>handle, comment("Panda3D modules that are implemented in C++.")
- print >>handle, "namespace panda3d {"
+ print(comment("Panda3D modules that are implemented in C++."), file=handle)
+ print("namespace panda3d {", file=handle)
# Determine the path to the interrogatedb files
interrogate_add_search_directory(os.path.join(os.path.dirname(pandac.__file__), "..", "..", "etc"))
@@ -295,5 +297,5 @@ if __name__ == "__main__":
processModule(handle, module_name)
- print >>handle, "}"
+ print("}", file=handle)
handle.close()
diff --git a/direct/src/directscripts/gendocs.py b/direct/src/directscripts/gendocs.py
index 7770203de4..6bb83c9567 100644
--- a/direct/src/directscripts/gendocs.py
+++ b/direct/src/directscripts/gendocs.py
@@ -48,7 +48,7 @@
#
########################################################################
-import os, sys, parser, symbol, token, types, re
+import os, sys, parser, symbol, token, re
########################################################################
#
@@ -103,7 +103,7 @@ def writeFileLines(wfile, lines):
sys.exit("Cannot write "+wfile)
def findFiles(dirlist, ext, ign, list):
- if isinstance(dirlist, types.StringTypes):
+ if isinstance(dirlist, str):
dirlist = [dirlist]
for dir in dirlist:
for file in os.listdir(dir):
@@ -195,8 +195,8 @@ class InterrogateTokenizer:
neg = 1
self.pos += 1
if (self.data[self.pos].isdigit()==0):
- print "File position "+str(self.pos)
- print "Text: "+self.data[self.pos:self.pos+50]
+ print("File position " + str(self.pos))
+ print("Text: " + self.data[self.pos:self.pos+50])
sys.exit("Syntax error in interrogate file format 0")
value = 0
while (self.data[self.pos].isdigit()):
@@ -340,20 +340,20 @@ class InterrogateDatabase:
def printTree(tree, indent):
spacing = " "[:indent]
- if isinstance(tree, types.TupleType) and isinstance(tree[0], types.IntType):
+ if isinstance(tree, tuple) and isinstance(tree[0], int):
if tree[0] in symbol.sym_name:
for i in range(len(tree)):
if (i==0):
- print spacing + "(symbol." + symbol.sym_name[tree[0]] + ","
+ print(spacing + "(symbol." + symbol.sym_name[tree[0]] + ",")
else:
printTree(tree[i], indent+1)
- print spacing + "),"
+ print(spacing + "),")
elif tree[0] in token.tok_name:
- print spacing + "(token." + token.tok_name[tree[0]] + ", '" + tree[1] + "'),"
+ print(spacing + "(token." + token.tok_name[tree[0]] + ", '" + tree[1] + "'),")
else:
- print spacing + str(tree)
+ print(spacing + str(tree))
else:
- print spacing + str(tree)
+ print(spacing + str(tree))
COMPOUND_STMT_PATTERN = (
@@ -447,7 +447,7 @@ class ParseTreeInfo:
self.function_info = {}
self.assign_info = {}
self.derivs = {}
- if isinstance(tree, types.StringType):
+ if isinstance(tree, str):
try:
tree = parser.suite(tree+"\n").totuple()
if (tree):
@@ -455,8 +455,8 @@ class ParseTreeInfo:
if found:
self.docstring = vars["docstring"]
except:
- print "CAUTION --- Parse failed: "+name
- if isinstance(tree, types.TupleType):
+ print("CAUTION --- Parse failed: " + name)
+ if isinstance(tree, tuple):
self.extract_info(tree)
def match(self, pattern, data, vars=None):
@@ -480,10 +480,10 @@ class ParseTreeInfo:
"""
if vars is None:
vars = {}
- if type(pattern) is types.ListType: # 'variables' are ['varname']
+ if type(pattern) is list: # 'variables' are ['varname']
vars[pattern[0]] = data
return 1, vars
- if type(pattern) is not types.TupleType:
+ if type(pattern) is not tuple:
return (pattern == data), vars
if len(data) != len(pattern):
return 0, vars
@@ -534,7 +534,7 @@ class ParseTreeInfo:
classinfo.derivs[vars["classname"]] = 1
def extract_tokens(self, str, tree):
- if (isinstance(tree, types.TupleType)):
+ if (isinstance(tree, tuple)):
if tree[0] in token.tok_name:
str = str + tree[1]
if (tree[1]==","): str=str+" "
@@ -564,7 +564,7 @@ class CodeDatabase:
self.varExports = {}
self.globalfn = []
self.formattedprotos = {}
- print "Reading C++ source files"
+ print("Reading C++ source files")
for cxx in cxxlist:
tokzr = InterrogateTokenizer(cxx)
idb = InterrogateDatabase(tokzr)
@@ -583,7 +583,7 @@ class CodeDatabase:
self.funcExports.setdefault("pandac.PandaModules", []).append(func.pyname)
else:
self.funcs[type.scopedname+"."+func.pyname] = func
- print "Reading Python sources files"
+ print("Reading Python sources files")
for py in pylist:
pyinf = ParseTreeInfo(readFile(py), py, py)
mod = pathToModule(py)
@@ -602,7 +602,7 @@ class CodeDatabase:
self.varExports.setdefault(mod, []).append(var)
def getClassList(self):
- return self.goodtypes.keys()
+ return list(self.goodtypes.keys())
def getGlobalFunctionList(self):
return self.globalfn
@@ -625,7 +625,7 @@ class CodeDatabase:
parents.append(basetype.scopedname)
return parents
elif (isinstance(type, ParseTreeInfo)):
- return type.derivs.keys()
+ return list(type.derivs.keys())
else:
return []
@@ -767,7 +767,7 @@ CLASS_RENAME_DICT = {
########################################################################
def makeCodeDatabase(indirlist, directdirlist):
- if isinstance(directdirlist, types.StringTypes):
+ if isinstance(directdirlist, str):
directdirlist = [directdirlist]
ignore = {}
ignore["__init__.py"] = 1
@@ -820,7 +820,7 @@ def generate(pversion, indirlist, directdirlist, docdir, header, footer, urlpref
classes = code.getClassList()[:]
classes.sort(None, str.lower)
xclasses = classes[:]
- print "Generating HTML pages"
+ print("Generating HTML pages")
for type in classes:
body = "" + type + " \n"
comment = code.getClassComment(type)
@@ -900,14 +900,14 @@ def generate(pversion, indirlist, directdirlist, docdir, header, footer, urlpref
index = "List of Methods - Panda " + pversion + " \n"
- prefixes = table.keys()
+ prefixes = list(table.keys())
prefixes.sort(None, str.lower)
for prefix in prefixes:
index = index + linkTo("#"+prefix, prefix) + " "
index = index + "' + "\n"
- names = table[prefix].keys()
+ names = list(table[prefix].keys())
names.sort(None, str.lower)
for name in names:
line = '' + name + ": \n"
@@ -968,9 +968,9 @@ def expandImports(indirlist, directdirlist, fixdirlist):
varExports = code.getVarExports(module)
if (len(typeExports)+len(funcExports)+len(varExports)==0):
result.append(line)
- print fixfile+" : "+module+" : no exports"
+ print(fixfile + " : " + module + " : no exports")
else:
- print fixfile+" : "+module+" : repairing"
+ print(fixfile + " : " + module + " : repairing")
for x in funcExports:
fn = code.getFunctionName(x)
if fn in used:
diff --git a/direct/src/directscripts/packpanda.py b/direct/src/directscripts/packpanda.py
index 1868b0f1cb..b8dec72610 100755
--- a/direct/src/directscripts/packpanda.py
+++ b/direct/src/directscripts/packpanda.py
@@ -13,7 +13,7 @@
#
##############################################################################
-import sys, os, getopt, string, shutil, py_compile, subprocess
+import sys, os, getopt, shutil, py_compile, subprocess
OPTIONLIST = [
("dir", 1, "Name of directory containing game"),
@@ -27,14 +27,14 @@ OPTIONLIST = [
]
def ParseFailure():
- print ""
- print "packpanda usage:"
- print ""
+ print("")
+ print("packpanda usage:")
+ print("")
for (opt, hasval, explanation) in OPTIONLIST:
if (hasval):
- print " --%-10s %s"%(opt+" x", explanation)
+ print(" --%-10s %s"%(opt+" x", explanation))
else:
- print " --%-10s %s"%(opt+" ", explanation)
+ print(" --%-10s %s"%(opt+" ", explanation))
sys.exit(1)
def ParseOptions(args):
@@ -75,7 +75,7 @@ for dir in sys.path:
PANDA=os.path.abspath(dir)
if (PANDA is None):
sys.exit("Cannot locate the panda root directory in the python path (cannot locate directory containing direct and pandac).")
-print "PANDA located at "+PANDA
+print("PANDA located at "+PANDA)
if (os.path.exists(os.path.join(PANDA,"..","makepanda","makepanda.py"))) and (sys.platform != "win32" or os.path.exists(os.path.join(PANDA,"..","thirdparty","win-nsis","makensis.exe"))):
PSOURCE=os.path.abspath(os.path.join(PANDA,".."))
@@ -95,7 +95,7 @@ else:
VER=OPTIONS["version"]
DIR=OPTIONS["dir"]
if (DIR==""):
- print "You must specify the --dir option."
+ print("You must specify the --dir option.")
ParseFailure()
DIR=os.path.abspath(DIR)
MYDIR=os.path.abspath(os.getcwd())
@@ -123,21 +123,21 @@ else: MAIN="main.py"
def PrintFileStatus(label, file):
if (os.path.exists(file)):
- print "%-15s: %s"%(label, file)
+ print("%-15s: %s"%(label, file))
else:
- print "%-15s: %s (MISSING)"%(label, file)
+ print("%-15s: %s (MISSING)"%(label, file))
PrintFileStatus("Dir", DIR)
-print "%-15s: %s"%("Name", NAME)
-print "%-15s: %s"%("Start Menu", SMDIRECTORY)
+print("%-15s: %s"%("Name", NAME))
+print("%-15s: %s"%("Start Menu", SMDIRECTORY))
PrintFileStatus("Main", os.path.join(DIR, MAIN))
if (sys.platform == "win32"):
PrintFileStatus("Icon", ICON)
PrintFileStatus("Bitmap", BITMAP)
PrintFileStatus("License", LICENSE)
-print "%-15s: %s"%("Output", OUTFILE)
+print("%-15s: %s"%("Output", OUTFILE))
if (sys.platform == "win32"):
- print "%-15s: %s"%("Install Dir", INSTALLDIR)
+ print("%-15s: %s"%("Install Dir", INSTALLDIR))
if (os.path.isdir(DIR)==0):
sys.exit("Difficulty reading "+DIR+". Cannot continue.")
@@ -181,8 +181,8 @@ if (sys.platform == "win32"):
else:
TMPGAME=os.path.join(TMPDIR,"usr","share","games",BASENAME,"game")
TMPETC=os.path.join(TMPDIR,"usr","share","games",BASENAME,"etc")
-print ""
-print "Copying the game to "+TMPDIR+"..."
+print("")
+print("Copying the game to "+TMPDIR+"...")
if (os.path.exists(TMPDIR)):
try: shutil.rmtree(TMPDIR)
except: sys.exit("Cannot delete "+TMPDIR)
@@ -247,7 +247,7 @@ def egg2bam(file,bam):
present = os.path.exists(bam)
if (present): bam = "packpanda-TMP.bam";
cmd = 'egg2bam -noabs -ps rel -pd . "'+file+'" -o "'+bam+'"'
- print "Executing: "+cmd
+ print("Executing: "+cmd)
if (sys.platform == "win32"):
res = os.spawnl(os.P_WAIT, EGG2BAM, cmd)
else:
@@ -257,7 +257,7 @@ def egg2bam(file,bam):
os.unlink(bam)
def py2pyc(file):
- print "Compiling python "+file
+ print("Compiling python "+file)
pyc = file[:-3]+'.pyc'
pyo = file[:-3]+'.pyo'
if (os.path.exists(pyc)): os.unlink(pyc)
@@ -284,24 +284,24 @@ def CompileFiles(file):
CompileFiles(os.path.join(file, x))
def DeleteFiles(file):
- base = string.lower(os.path.basename(file))
+ base = os.path.basename(file).lower()
if (os.path.isdir(file)):
for pattern in OPTIONS["rmdir"]:
- if (string.lower(pattern) == base):
- print "Deleting "+file
+ if pattern.lower() == base:
+ print("Deleting "+file)
shutil.rmtree(file)
return
for x in os.listdir(file):
DeleteFiles(os.path.join(file, x))
else:
for ext in OPTIONS["rmext"]:
- if (base[-(len(ext)+1):] == string.lower("."+ext)):
- print "Deleting "+file
+ if base[-(len(ext) + 1):] == ("." + ext).lower():
+ print("Deleting "+file)
os.unlink(file)
return
-print ""
-print "Compiling BAM and PYC files..."
+print("")
+print("Compiling BAM and PYC files...")
os.chdir(TMPGAME)
CompileFiles(".")
DeleteFiles(".")
@@ -371,9 +371,9 @@ if (sys.platform == "win32"):
CMD=CMD+'/DPPICON="'+PPICON+'" '
CMD=CMD+'"'+PSOURCE+'\\direct\\directscripts\\packpanda.nsi"'
- print ""
- print CMD
- print "packing..."
+ print("")
+ print(CMD)
+ print("packing...")
subprocess.call(CMD)
else:
os.chdir(MYDIR)
diff --git a/direct/src/directtools/DirectCameraControl.py b/direct/src/directtools/DirectCameraControl.py
index e3fbe6c8b7..2913260c57 100644
--- a/direct/src/directtools/DirectCameraControl.py
+++ b/direct/src/directtools/DirectCameraControl.py
@@ -1,8 +1,8 @@
from direct.showbase.DirectObject import DirectObject
-from DirectUtil import *
-from DirectGeometry import *
-from DirectGlobals import *
-from DirectSelection import SelectionRay
+from .DirectUtil import *
+from .DirectGeometry import *
+from .DirectGlobals import *
+from .DirectSelection import SelectionRay
from direct.interval.IntervalGlobal import Sequence, Func
from direct.directnotify import DirectNotifyGlobal
from direct.task import Task
@@ -233,13 +233,13 @@ class DirectCameraControl(DirectObject):
self.updateCoaMarkerSize()
def mouseFlyStartTopWin(self):
- print "Moving mouse 2 in new window"
+ print("Moving mouse 2 in new window")
#altIsDown = base.getAlt()
#if altIsDown:
# print "Alt is down"
def mouseFlyStopTopWin(self):
- print "Stopping mouse 2 in new window"
+ print("Stopping mouse 2 in new window")
def spawnXZTranslateOrHPanYZoom(self):
# Kill any existing tasks
diff --git a/direct/src/directtools/DirectGeometry.py b/direct/src/directtools/DirectGeometry.py
index 9c748e57b3..2c69a8d8d5 100644
--- a/direct/src/directtools/DirectGeometry.py
+++ b/direct/src/directtools/DirectGeometry.py
@@ -1,7 +1,7 @@
from panda3d.core import *
-from DirectGlobals import *
-from DirectUtil import *
+from .DirectGlobals import *
+from .DirectUtil import *
import math
class LineNodePath(NodePath):
@@ -28,10 +28,10 @@ class LineNodePath(NodePath):
ls.setColor(colorVec)
def moveTo(self, *_args):
- apply(self.lineSegs.moveTo, _args)
+ self.lineSegs.moveTo(*_args)
def drawTo(self, *_args):
- apply(self.lineSegs.drawTo, _args)
+ self.lineSegs.drawTo(*_args)
def create(self, frameAccurate = 0):
self.lineSegs.create(self.lineNode, frameAccurate)
@@ -47,13 +47,13 @@ class LineNodePath(NodePath):
self.lineSegs.setThickness(thickness)
def setColor(self, *_args):
- apply(self.lineSegs.setColor, _args)
+ self.lineSegs.setColor(*_args)
def setVertex(self, *_args):
- apply(self.lineSegs.setVertex, _args)
+ self.lineSegs.setVertex(*_args)
def setVertexColor(self, vertex, *_args):
- apply(self.lineSegs.setVertexColor, (vertex,) + _args)
+ self.lineSegs.setVertexColor(*(vertex,) + _args)
def getCurrentPosition(self):
return self.lineSegs.getCurrentPosition()
@@ -119,9 +119,9 @@ class LineNodePath(NodePath):
Given a list of lists of points, draw a separate line for each list
"""
for pointList in lineList:
- apply(self.moveTo, pointList[0])
+ self.moveTo(*pointList[0])
for point in pointList[1:]:
- apply(self.drawTo, point)
+ self.drawTo(*point)
##
## Given a point in space, and a direction, find the point of intersection
diff --git a/direct/src/directtools/DirectGlobals.py b/direct/src/directtools/DirectGlobals.py
index 372d16839f..9d10a3f691 100644
--- a/direct/src/directtools/DirectGlobals.py
+++ b/direct/src/directtools/DirectGlobals.py
@@ -51,12 +51,12 @@ LE_CAM_MASKS = {'persp':LE_PERSP_CAM_MASK,
'top':LE_TOP_CAM_MASK}
def LE_showInAllCam(nodePath):
- for camName in LE_CAM_MASKS.keys():
+ for camName in LE_CAM_MASKS:
nodePath.show(LE_CAM_MASKS[camName])
def LE_showInOneCam(nodePath, thisCamName):
LE_showInAllCam(nodePath)
- for camName in LE_CAM_MASKS.keys():
+ for camName in LE_CAM_MASKS:
if camName != thisCamName:
nodePath.hide(LE_CAM_MASKS[camName])
diff --git a/direct/src/directtools/DirectGrid.py b/direct/src/directtools/DirectGrid.py
index e7e67823a3..80d8280ec0 100644
--- a/direct/src/directtools/DirectGrid.py
+++ b/direct/src/directtools/DirectGrid.py
@@ -1,8 +1,8 @@
from panda3d.core import *
from direct.showbase.DirectObject import DirectObject
-from DirectUtil import *
-from DirectGeometry import *
+from .DirectUtil import *
+from .DirectGeometry import *
class DirectGrid(NodePath, DirectObject):
def __init__(self,gridSize=100.0,gridSpacing=5.0,planeColor=(0.5,0.5,0.5,0.5),parent = None):
diff --git a/direct/src/directtools/DirectLights.py b/direct/src/directtools/DirectLights.py
index 1797351032..f20f08aca7 100644
--- a/direct/src/directtools/DirectLights.py
+++ b/direct/src/directtools/DirectLights.py
@@ -78,7 +78,7 @@ class DirectLights(NodePath):
light.setColor(VBase4(1))
light.setLens(PerspectiveLens())
else:
- print 'Invalid light type'
+ print('Invalid light type')
return None
# Add the new light
directLight = DirectLight(light, self)
diff --git a/direct/src/directtools/DirectManipulation.py b/direct/src/directtools/DirectManipulation.py
index ad9a1c0e51..3ebc697400 100644
--- a/direct/src/directtools/DirectManipulation.py
+++ b/direct/src/directtools/DirectManipulation.py
@@ -1,10 +1,9 @@
from direct.showbase.DirectObject import DirectObject
-from DirectGlobals import *
-from DirectUtil import *
-from DirectGeometry import *
-from DirectSelection import SelectionRay
+from .DirectGlobals import *
+from .DirectUtil import *
+from .DirectGeometry import *
+from .DirectSelection import SelectionRay
from direct.task import Task
-import types
from copy import deepcopy
class DirectManipulationControl(DirectObject):
@@ -1207,7 +1206,7 @@ class ObjectHandles(NodePath, DirectObject):
self.reparentTo(hidden)
def enableHandles(self, handles):
- if type(handles) == types.ListType:
+ if type(handles) == list:
for handle in handles:
self.enableHandle(handle)
elif handles == 'x':
@@ -1256,7 +1255,7 @@ class ObjectHandles(NodePath, DirectObject):
self.zScaleGroup.reparentTo(self.zHandles)
def disableHandles(self, handles):
- if type(handles) == types.ListType:
+ if type(handles) == list:
for handle in handles:
self.disableHandle(handle)
elif handles == 'x':
diff --git a/direct/src/directtools/DirectSelection.py b/direct/src/directtools/DirectSelection.py
index 2b2373ce26..ef14fb429b 100644
--- a/direct/src/directtools/DirectSelection.py
+++ b/direct/src/directtools/DirectSelection.py
@@ -1,7 +1,7 @@
from direct.showbase.DirectObject import DirectObject
-from DirectGlobals import *
-from DirectUtil import *
-from DirectGeometry import *
+from .DirectGlobals import *
+from .DirectUtil import *
+from .DirectGeometry import *
COA_ORIGIN = 0
COA_CENTER = 1
@@ -68,7 +68,7 @@ class SelectedNodePaths(DirectObject):
""" Select the specified node path. Multiselect as required """
# Do nothing if nothing selected
if not nodePath:
- print 'Nothing selected!!'
+ print('Nothing selected!!')
return None
# Reset selected objects and highlight if multiSelect is false
@@ -160,7 +160,7 @@ class SelectedNodePaths(DirectObject):
return None
def getDeselectedAsList(self):
- return self.deselectedDict.values()[:]
+ return list(self.deselectedDict.values())
def getDeselectedDict(self, id):
"""
@@ -260,7 +260,7 @@ class SelectedNodePaths(DirectObject):
return self.getDeselectedDict(id)
def getNumSelected(self):
- return len(self.selectedDict.keys())
+ return len(self.selectedDict)
class DirectBoundingBox:
diff --git a/direct/src/directtools/DirectSession.py b/direct/src/directtools/DirectSession.py
index 2fb18b5806..96f8bdb610 100644
--- a/direct/src/directtools/DirectSession.py
+++ b/direct/src/directtools/DirectSession.py
@@ -1,27 +1,25 @@
import math
-import types
-import string
+import sys
from panda3d.core import *
-from DirectUtil import *
+from .DirectUtil import *
from direct.showbase.DirectObject import DirectObject
from direct.task import Task
-from DirectGlobals import DIRECT_NO_MOD
-from DirectCameraControl import DirectCameraControl
-from DirectManipulation import DirectManipulationControl
-from DirectSelection import SelectionRay, COA_ORIGIN, SelectedNodePaths
-from DirectGrid import DirectGrid
+from .DirectGlobals import DIRECT_NO_MOD
+from .DirectCameraControl import DirectCameraControl
+from .DirectManipulation import DirectManipulationControl
+from .DirectSelection import SelectionRay, COA_ORIGIN, SelectedNodePaths
+from .DirectGrid import DirectGrid
#from DirectGeometry import *
-from DirectLights import DirectLights
+from .DirectLights import DirectLights
from direct.cluster.ClusterClient import createClusterClient, DummyClusterClient
from direct.cluster.ClusterServer import ClusterServer
## from direct.tkpanels import Placer
## from direct.tkwidgets import Slider
## from direct.tkwidgets import SceneGraphExplorer
from direct.gui import OnscreenText
-from direct.showbase import Loader
from direct.interval.IntervalGlobal import *
class DirectSession(DirectObject):
@@ -115,7 +113,7 @@ class DirectSession(DirectObject):
if fastrak:
from direct.directdevices import DirectFastrak
# parse string into format device:N where N is the sensor name
- fastrak = string.split(fastrak)
+ fastrak = fastrak.split()
for i in range(len(fastrak))[1:]:
self.fastrak.append(DirectFastrak.DirectFastrak(fastrak[0] + ':' + fastrak[i]))
@@ -556,12 +554,12 @@ class DirectSession(DirectObject):
input = input[:-7]
# Deal with keyboard and mouse input
- if input in self.hotKeyMap.keys():
+ if input in self.hotKeyMap:
keyDesc = self.hotKeyMap[input]
messenger.send(keyDesc[1])
- elif input in self.speicalKeyMap.keys():
+ elif input in self.speicalKeyMap:
messenger.send(self.speicalKeyMap[input])
- elif input in self.directOnlyKeyMap.keys():
+ elif input in self.directOnlyKeyMap:
if self.fIgnoreDirectOnlyKeyMap:
return
keyDesc = self.directOnlyKeyMap[input]
@@ -808,7 +806,7 @@ class DirectSession(DirectObject):
def isNotCycle(self, nodePath, parent):
if nodePath == parent:
- print 'DIRECT.reparent: Invalid parent'
+ print('DIRECT.reparent: Invalid parent')
return 0
elif parent.hasParent():
return self.isNotCycle(nodePath, parent.getParent())
@@ -944,7 +942,10 @@ class DirectSession(DirectObject):
def getAndSetName(self, nodePath):
""" Prompt user for new node path name """
- from tkSimpleDialog import askstring
+ if sys.version_info >= (3, 0):
+ from tkinter.simpledialog import askstring
+ else:
+ from tkSimpleDialog import askstring
newName = askstring('Node Path: ' + nodePath.getName(),
'Enter new name:')
if newName:
diff --git a/direct/src/directtools/DirectUtil.py b/direct/src/directtools/DirectUtil.py
index 224b069b9d..9919f841b2 100644
--- a/direct/src/directtools/DirectUtil.py
+++ b/direct/src/directtools/DirectUtil.py
@@ -1,5 +1,5 @@
-from DirectGlobals import *
+from .DirectGlobals import *
# Routines to adjust values
def ROUND_TO(value, divisor):
diff --git a/direct/src/directutil/DeltaProfiler.py b/direct/src/directutil/DeltaProfiler.py
index 8e2612fd1c..2c51c699be 100755
--- a/direct/src/directutil/DeltaProfiler.py
+++ b/direct/src/directutil/DeltaProfiler.py
@@ -16,11 +16,11 @@ class DeltaProfiler:
def printDeltaTime(self, label):
if self.active:
deltaTime=time()-self.priorTime
- print "%s DeltaTime %-25s to %-25s: %3.5f"%(
+ print("%s DeltaTime %-25s to %-25s: %3.5f"%(
self.name,
self.priorLabel,
label,
- deltaTime)
+ deltaTime))
self.priorLabel=label
# The printing time is not included in the timing.
# This is intentional.
diff --git a/direct/src/directutil/DistributedLargeBlobSender.py b/direct/src/directutil/DistributedLargeBlobSender.py
index ae521369c2..39748a13a2 100755
--- a/direct/src/directutil/DistributedLargeBlobSender.py
+++ b/direct/src/directutil/DistributedLargeBlobSender.py
@@ -2,7 +2,7 @@
from direct.distributed import DistributedObject
from direct.directnotify import DirectNotifyGlobal
-import LargeBlobSenderConsts
+from . import LargeBlobSenderConsts
class DistributedLargeBlobSender(DistributedObject.DistributedObject):
"""DistributedLargeBlobSender: for sending large chunks of data through
diff --git a/direct/src/directutil/DistributedLargeBlobSenderAI.py b/direct/src/directutil/DistributedLargeBlobSenderAI.py
index b679a5f714..648599731d 100755
--- a/direct/src/directutil/DistributedLargeBlobSenderAI.py
+++ b/direct/src/directutil/DistributedLargeBlobSenderAI.py
@@ -2,7 +2,7 @@
from direct.distributed import DistributedObjectAI
from direct.directnotify import DirectNotifyGlobal
-import LargeBlobSenderConsts
+from . import LargeBlobSenderConsts
class DistributedLargeBlobSenderAI(DistributedObjectAI.DistributedObjectAI):
"""DistributedLargeBlobSenderAI: for sending large chunks of data through
diff --git a/direct/src/directutil/MemoryLeakHelpers.py b/direct/src/directutil/MemoryLeakHelpers.py
index 4607d05e16..950e7fd9b1 100755
--- a/direct/src/directutil/MemoryLeakHelpers.py
+++ b/direct/src/directutil/MemoryLeakHelpers.py
@@ -11,7 +11,7 @@
import gc
gc.set_debug(gc.DEBUG_LEAK)
gc.collect()
-print gc.garbage
+print(gc.garbage)
# Inside DistributedObjectAI, you can uncomment the __del__ function to
# see when your objects are being deleted (or not)
diff --git a/direct/src/directutil/Mopath.py b/direct/src/directutil/Mopath.py
index 07d7dd63b2..05e437d34d 100644
--- a/direct/src/directutil/Mopath.py
+++ b/direct/src/directutil/Mopath.py
@@ -29,7 +29,7 @@ class Mopath(DirectObject):
elif isinstance( objectToLoad, str ):
self.loadFile( objectToLoad )
elif objectToLoad is not None:
- print "Mopath: Unable to load object '%s', objectToLoad must be a file name string or a NodePath" % objectToLoad
+ print("Mopath: Unable to load object '%s', objectToLoad must be a file name string or a NodePath" % objectToLoad)
def getMaxT(self):
return self.maxT * self.timeScale
@@ -40,7 +40,7 @@ class Mopath(DirectObject):
self.loadNodePath(nodePath)
nodePath.removeNode()
else:
- print 'Mopath: no data in file: %s' % filename
+ print('Mopath: no data in file: %s' % filename)
def loadNodePath(self, nodePath, fReset = 1):
@@ -55,7 +55,7 @@ class Mopath(DirectObject):
elif (self.hprNurbsCurve != None):
self.maxT = self.hprNurbsCurve.getMaxT()
else:
- print 'Mopath: no valid curves in nodePath: %s' % nodePath
+ print('Mopath: no valid curves in nodePath: %s' % nodePath)
def reset(self):
@@ -77,7 +77,7 @@ class Mopath(DirectObject):
if (self.xyzNurbsCurve == None):
self.xyzNurbsCurve = node
else:
- print 'Mopath: got a PCT_NONE curve and an XYZ Curve in nodePath: %s' % nodePath
+ print('Mopath: got a PCT_NONE curve and an XYZ Curve in nodePath: %s' % nodePath)
elif (node.getCurveType() == PCTT):
self.tNurbsCurve.append(node)
else:
@@ -106,7 +106,7 @@ class Mopath(DirectObject):
def goTo(self, node, time):
if (self.xyzNurbsCurve == None) and (self.hprNurbsCurve == None):
- print 'Mopath: Mopath has no curves'
+ print('Mopath: Mopath has no curves')
return
time /= self.timeScale
self.playbackTime = self.calcTime(CLAMP(time, 0.0, self.maxT))
@@ -145,7 +145,7 @@ class Mopath(DirectObject):
def play(self, node, time = 0.0, loop = 0):
if (self.xyzNurbsCurve == None) and (self.hprNurbsCurve == None):
- print 'Mopath: Mopath has no curves'
+ print('Mopath: Mopath has no curves')
return
self.node = node
self.loop = loop
diff --git a/direct/src/directutil/Verify.py b/direct/src/directutil/Verify.py
index 8a1f41acb5..ce23b1daa9 100755
--- a/direct/src/directutil/Verify.py
+++ b/direct/src/directutil/Verify.py
@@ -52,11 +52,11 @@ def verify(assertion):
wish to have the assertion checked, even in release (-O) code.
"""
if not assertion:
- print "\n\nverify failed:"
+ print("\n\nverify failed:")
import sys
- print " File \"%s\", line %d"%(
+ print(" File \"%s\", line %d"%(
sys._getframe(1).f_code.co_filename,
- sys._getframe(1).f_lineno)
+ sys._getframe(1).f_lineno))
if wantVerifyPdb:
import pdb
pdb.set_trace()
diff --git a/direct/src/distributed/AsyncRequest.py b/direct/src/distributed/AsyncRequest.py
index dc3c6bf4d6..1d30259a6e 100755
--- a/direct/src/distributed/AsyncRequest.py
+++ b/direct/src/distributed/AsyncRequest.py
@@ -1,7 +1,7 @@
#from otp.ai.AIBaseGlobal import *
from direct.directnotify import DirectNotifyGlobal
from direct.showbase.DirectObject import DirectObject
-from ConnectionRepository import *
+from .ConnectionRepository import *
from panda3d.core import ConfigVariableDouble, ConfigVariableInt, ConfigVariableBool
ASYNC_REQUEST_DEFAULT_TIMEOUT_IN_SECONDS = 8.0
@@ -251,9 +251,9 @@ class AsyncRequest(DirectObject):
if __debug__:
if _breakOnTimeout:
if hasattr(self, "avatarId"):
- print "\n\nself.avatarId =", self.avatarId
- print "\nself.neededObjects =", self.neededObjects
- print "\ntimed out after %s seconds.\n\n"%(task.delayTime,)
+ print("\n\nself.avatarId =", self.avatarId)
+ print("\nself.neededObjects =", self.neededObjects)
+ print("\ntimed out after %s seconds.\n\n"%(task.delayTime,))
import pdb; pdb.set_trace()
self.delete()
return Task.done
diff --git a/direct/src/distributed/CRCache.py b/direct/src/distributed/CRCache.py
index 2c3d966778..b256c4f13e 100644
--- a/direct/src/distributed/CRCache.py
+++ b/direct/src/distributed/CRCache.py
@@ -1,7 +1,7 @@
"""CRCache module: contains the CRCache class"""
from direct.directnotify import DirectNotifyGlobal
-import DistributedObject
+from . import DistributedObject
class CRCache:
notify = DirectNotifyGlobal.directNotify.newCategory("CRCache")
diff --git a/direct/src/distributed/CRDataCache.py b/direct/src/distributed/CRDataCache.py
index afc86abaa1..85036544de 100755
--- a/direct/src/distributed/CRDataCache.py
+++ b/direct/src/distributed/CRDataCache.py
@@ -23,7 +23,7 @@ class CRDataCache:
# cache is full, throw out a random doId's data
if self._junkIndex >= len(self._doId2name2data):
self._junkIndex = 0
- junkDoId = self._doId2name2data.keys()[self._junkIndex]
+ junkDoId = list(self._doId2name2data.keys())[self._junkIndex]
self._junkIndex += 1
for name in self._doId2name2data[junkDoId]:
self._doId2name2data[junkDoId][name].flush()
@@ -96,7 +96,7 @@ if __debug__:
assert 'testCachedData2' in data
assert data['testCachedData'].foo == 34
assert data['testCachedData2'].bar == 45
- for cd in data.itervalues():
+ for cd in data.values():
cd.flush()
del data
dc._checkMemLeaks()
diff --git a/direct/src/distributed/ClientRepository.py b/direct/src/distributed/ClientRepository.py
index a22c5b404c..b3745c1355 100644
--- a/direct/src/distributed/ClientRepository.py
+++ b/direct/src/distributed/ClientRepository.py
@@ -1,12 +1,12 @@
"""ClientRepository module: contains the ClientRepository class"""
-from ClientRepositoryBase import ClientRepositoryBase
+from .ClientRepositoryBase import ClientRepositoryBase
from direct.directnotify import DirectNotifyGlobal
-from MsgTypesCMU import *
-from PyDatagram import PyDatagram
-from PyDatagramIterator import PyDatagramIterator
+from .MsgTypesCMU import *
+from .PyDatagram import PyDatagram
+from .PyDatagramIterator import PyDatagramIterator
from panda3d.core import UniqueIdAllocator
-import types
+
class ClientRepository(ClientRepositoryBase):
"""
@@ -305,7 +305,7 @@ class ClientRepository(ClientRepositoryBase):
def handleDatagram(self, di):
if self.notify.getDebug():
- print "ClientRepository received datagram:"
+ print("ClientRepository received datagram:")
di.getDatagram().dumpHex(ostream)
msgType = self.getMsgType()
diff --git a/direct/src/distributed/ClientRepositoryBase.py b/direct/src/distributed/ClientRepositoryBase.py
index 9f60eaac98..9836f0fd0b 100644
--- a/direct/src/distributed/ClientRepositoryBase.py
+++ b/direct/src/distributed/ClientRepositoryBase.py
@@ -1,18 +1,16 @@
from pandac.PandaModules import *
-from MsgTypes import *
+from .MsgTypes import *
from direct.task import Task
from direct.directnotify import DirectNotifyGlobal
-import CRCache
+from . import CRCache
from direct.distributed.CRDataCache import CRDataCache
from direct.distributed.ConnectionRepository import ConnectionRepository
from direct.showbase import PythonUtil
-import ParentMgr
-import RelatedObjectMgr
+from . import ParentMgr
+from . import RelatedObjectMgr
import time
-from ClockDelta import *
-from PyDatagram import PyDatagram
-from PyDatagramIterator import PyDatagramIterator
-import types
+from .ClockDelta import *
+
class ClientRepositoryBase(ConnectionRepository):
"""
@@ -190,7 +188,7 @@ class ClientRepositoryBase(ConnectionRepository):
for dg, di in updates:
# non-DC updates that need to be played back in-order are
# stored as (msgType, (dg, di))
- if type(di) is types.TupleType:
+ if type(di) is tuple:
msgType = dg
dg, di = di
self.replayDeferredGenerate(msgType, (dg, di))
@@ -264,7 +262,7 @@ class ClientRepositoryBase(ConnectionRepository):
distObj.setLocation(parentId, zoneId)
distObj.updateRequiredFields(dclass, di)
# updateRequiredFields calls announceGenerate
- print "New DO:%s, dclass:%s"%(doId, dclass.getName())
+ print("New DO:%s, dclass:%s"%(doId, dclass.getName()))
return distObj
def generateWithRequiredOtherFields(self, dclass, doId, di,
@@ -602,8 +600,8 @@ class ClientRepositoryBase(ConnectionRepository):
del self._delayDeletedDOs[key]
def printDelayDeletes(self):
- print 'DelayDeletes:'
- print '============='
- for obj in self._delayDeletedDOs.itervalues():
- print '%s\t%s (%s)\tdelayDeletes=%s' % (
- obj.doId, safeRepr(obj), itype(obj), obj.getDelayDeleteNames())
+ print('DelayDeletes:')
+ print('=============')
+ for obj in self._delayDeletedDOs.values():
+ print('%s\t%s (%s)\tdelayDeletes=%s' % (
+ obj.doId, safeRepr(obj), itype(obj), obj.getDelayDeleteNames()))
diff --git a/direct/src/distributed/ConnectionRepository.py b/direct/src/distributed/ConnectionRepository.py
index 8af690357a..deda5ab5c6 100644
--- a/direct/src/distributed/ConnectionRepository.py
+++ b/direct/src/distributed/ConnectionRepository.py
@@ -4,15 +4,12 @@ from direct.directnotify.DirectNotifyGlobal import directNotify
from direct.distributed.DoInterestManager import DoInterestManager
from direct.distributed.DoCollectionManager import DoCollectionManager
from direct.showbase import GarbageReport
-from PyDatagram import PyDatagram
-from PyDatagramIterator import PyDatagramIterator
+from .PyDatagramIterator import PyDatagramIterator
import types
-import imp
import gc
-
class ConnectionRepository(
DoInterestManager, DoCollectionManager, CConnectionRepository):
"""
@@ -248,7 +245,7 @@ class ConnectionRepository(
self.dclassesByNumber = {}
self.hashVal = 0
- if isinstance(dcFileNames, types.StringTypes):
+ if isinstance(dcFileNames, str):
# If we were given a single string, make it a list.
dcFileNames = [dcFileNames]
@@ -514,7 +511,7 @@ class ConnectionRepository(
if failureCallback:
failureCallback(0, '', *failureArgs)
else:
- print "uh oh, we aren't using one of the tri-state CM variables"
+ print("uh oh, we aren't using one of the tri-state CM variables")
failureCallback(0, '', *failureArgs)
def disconnect(self):
diff --git a/direct/src/distributed/DistributedCamera.py b/direct/src/distributed/DistributedCamera.py
index 7ea07d91bb..297a24bf98 100755
--- a/direct/src/distributed/DistributedCamera.py
+++ b/direct/src/distributed/DistributedCamera.py
@@ -148,8 +148,8 @@ class Fixture(NodePath, FSM):
# if added to the dc definition of the Fixture struct and
# saved out to the Camera file.
lodNodes = render.findAllMatches('**/+LODNode')
- for i in xrange(0,lodNodes.getNumPaths()):
- lodNodes[i].node().forceSwitch(lodNodes[i].node().getHighestSwitch())
+ for lodNode in lodNodes:
+ lodNode.node().forceSwitch(lodNode.node().getHighestSwitch())
def exitUsing(self):
@@ -183,13 +183,13 @@ class DistributedCamera(DistributedObject):
def __str__(self):
out = ''
- for fixture in self.fixtures.itervalues():
+ for fixture in self.fixtures.values():
out = '%s\n%s' % (out, fixture)
return out[1:]
def pack(self):
out = ''
- for fixture in self.fixtures.itervalues():
+ for fixture in self.fixtures.values():
out = '%s\n%s' % (out, fixture.pack())
return out[1:]
@@ -198,7 +198,7 @@ class DistributedCamera(DistributedObject):
self.parent = None
- for fixture in self.fixtures.itervalues():
+ for fixture in self.fixtures.values():
fixture.cleanup()
fixture.detachNode()
self.fixtures = {}
@@ -215,7 +215,7 @@ class DistributedCamera(DistributedObject):
else:
self.parent = self.cr.getDo(doId)
- for fix in self.fixtures.itervalues():
+ for fix in self.fixtures.values():
fix.reparentTo(self.parent)
def getCamParent(self):
diff --git a/direct/src/distributed/DistributedCartesianGrid.py b/direct/src/distributed/DistributedCartesianGrid.py
index 80d0bafc4e..8c156af9d1 100755
--- a/direct/src/distributed/DistributedCartesianGrid.py
+++ b/direct/src/distributed/DistributedCartesianGrid.py
@@ -15,7 +15,7 @@ if __debug__:
from direct.directtools.DirectGeometry import *
from direct.showbase.PythonUtil import randFloat
-from CartesianGridBase import CartesianGridBase
+from .CartesianGridBase import CartesianGridBase
# increase this number if you want to visualize the grid lines
# above water level
diff --git a/direct/src/distributed/DistributedCartesianGridAI.py b/direct/src/distributed/DistributedCartesianGridAI.py
index e9f3b53816..3b830b8028 100755
--- a/direct/src/distributed/DistributedCartesianGridAI.py
+++ b/direct/src/distributed/DistributedCartesianGridAI.py
@@ -2,8 +2,8 @@
from pandac.PandaModules import *
from direct.directnotify.DirectNotifyGlobal import directNotify
from direct.task import Task
-from DistributedNodeAI import DistributedNodeAI
-from CartesianGridBase import CartesianGridBase
+from .DistributedNodeAI import DistributedNodeAI
+from .CartesianGridBase import CartesianGridBase
class DistributedCartesianGridAI(DistributedNodeAI, CartesianGridBase):
notify = directNotify.newCategory("DistributedCartesianGridAI")
diff --git a/direct/src/distributed/DistributedNode.py b/direct/src/distributed/DistributedNode.py
index 590a58eeb4..1b0c3412dc 100644
--- a/direct/src/distributed/DistributedNode.py
+++ b/direct/src/distributed/DistributedNode.py
@@ -1,10 +1,9 @@
"""DistributedNode module: contains the DistributedNode class"""
from panda3d.core import NodePath
-from direct.task import Task
-import GridParent
-import DistributedObject
-import types
+from . import GridParent
+from . import DistributedObject
+
class DistributedNode(DistributedObject.DistributedObject, NodePath):
"""Distributed Node class:"""
@@ -77,7 +76,7 @@ class DistributedNode(DistributedObject.DistributedObject, NodePath):
### setParent ###
def b_setParent(self, parentToken):
- if type(parentToken) == types.StringType:
+ if type(parentToken) == str:
self.setParentStr(parentToken)
else:
self.setParent(parentToken)
@@ -85,7 +84,7 @@ class DistributedNode(DistributedObject.DistributedObject, NodePath):
self.d_setParent(parentToken)
def d_setParent(self, parentToken):
- if type(parentToken) == types.StringType:
+ if type(parentToken) == str:
self.sendUpdate("setParentStr", [parentToken])
else:
self.sendUpdate("setParent", [parentToken])
diff --git a/direct/src/distributed/DistributedNodeAI.py b/direct/src/distributed/DistributedNodeAI.py
index e48fb3e70b..3d30e8d707 100644
--- a/direct/src/distributed/DistributedNodeAI.py
+++ b/direct/src/distributed/DistributedNodeAI.py
@@ -1,7 +1,7 @@
from pandac.PandaModules import NodePath
-import DistributedObjectAI
-import GridParent
-import types
+from . import DistributedObjectAI
+from . import GridParent
+
class DistributedNodeAI(DistributedObjectAI.DistributedObjectAI, NodePath):
def __init__(self, air, name=None):
@@ -47,7 +47,7 @@ class DistributedNodeAI(DistributedObjectAI.DistributedObjectAI, NodePath):
### setParent ###
def b_setParent(self, parentToken):
- if type(parentToken) == types.StringType:
+ if type(parentToken) == str:
self.setParentStr(parentToken)
else:
self.setParent(parentToken)
diff --git a/direct/src/distributed/DistributedNodeUD.py b/direct/src/distributed/DistributedNodeUD.py
index 1924a03420..21d6a2dbbb 100755
--- a/direct/src/distributed/DistributedNodeUD.py
+++ b/direct/src/distributed/DistributedNodeUD.py
@@ -1,5 +1,5 @@
#from otp.ai.AIBaseGlobal import *
-from DistributedObjectUD import DistributedObjectUD
+from .DistributedObjectUD import DistributedObjectUD
class DistributedNodeUD(DistributedObjectUD):
def __init__(self, air, name=None):
@@ -13,7 +13,7 @@ class DistributedNodeUD(DistributedObjectUD):
name = self.__class__.__name__
def b_setParent(self, parentToken):
- if type(parentToken) == types.StringType:
+ if type(parentToken) == str:
self.setParentStr(parentToken)
else:
self.setParent(parentToken)
diff --git a/direct/src/distributed/DistributedObject.py b/direct/src/distributed/DistributedObject.py
index cfd25fda23..0ed3e90a54 100644
--- a/direct/src/distributed/DistributedObject.py
+++ b/direct/src/distributed/DistributedObject.py
@@ -1,6 +1,7 @@
"""DistributedObject module: contains the DistributedObject class"""
-from pandac.PandaModules import *
+from panda3d.core import *
+from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import directNotify
from direct.distributed.DistributedObjectBase import DistributedObjectBase
from direct.showbase.PythonUtil import StackTrace
@@ -80,14 +81,11 @@ class DistributedObject(DistributedObjectBase):
and conditionally show generated, disabled, neverDisable,
or cachable"
"""
- spaces=' '*(indent+2)
+ spaces = ' ' * (indent + 2)
try:
- print "%s%s:"%(
- ' '*indent, self.__class__.__name__)
- print "%sfrom DistributedObject doId:%s, parent:%s, zone:%s"%(
- spaces,
- self.doId, self.parentId, self.zoneId),
- flags=[]
+ print("%s%s:" % (' ' * indent, self.__class__.__name__))
+
+ flags = []
if self.activeState == ESGenerated:
flags.append("generated")
if self.activeState < ESGenerating:
@@ -96,10 +94,15 @@ class DistributedObject(DistributedObjectBase):
flags.append("neverDisable")
if self.cacheable:
flags.append("cacheable")
+
+ flagStr = ""
if len(flags):
- print "(%s)"%(" ".join(flags),),
- print
- except Exception, e: print "%serror printing status"%(spaces,), e
+ flagStr = " (%s)" % (" ".join(flags))
+
+ print("%sfrom DistributedObject doId:%s, parent:%s, zone:%s%s" % (
+ spaces, self.doId, self.parentId, self.zoneId, flagStr))
+ except Exception as e:
+ print("%serror printing status %s" % (spaces, e))
def getAutoInterests(self):
# returns the sub-zones under this object that are automatically
@@ -123,7 +126,7 @@ class DistributedObject(DistributedObjectBase):
p = DCPacker()
p.setUnpackData(field.getDefaultValue())
len = p.rawUnpackUint16()/4
- for i in xrange(len):
+ for i in range(len):
zone = int(p.rawUnpackUint32())
autoInterests.add(zone)
autoInterests.update(autoInterests)
@@ -247,7 +250,7 @@ class DistributedObject(DistributedObjectBase):
# we are going to crash, output the destroyDo stacktrace
self.notify.warning('self.cr is none in _deactivateDO %d' % self.doId)
if hasattr(self, 'destroyDoStackTrace'):
- print self.destroyDoStackTrace
+ print(self.destroyDoStackTrace)
self.__callbacks = {}
self.cr.closeAutoInterests(self)
self.setLocation(0,0)
@@ -260,7 +263,7 @@ class DistributedObject(DistributedObjectBase):
# check for leftover cached data that was not retrieved or flushed by this object
# this will catch typos in the data name in calls to get/setCachedData
if hasattr(self, '_cachedData'):
- for name, cachedData in self._cachedData.iteritems():
+ for name, cachedData in self._cachedData.items():
self.notify.warning('flushing unretrieved cached data: %s' % name)
cachedData.flush()
del self._cachedData
@@ -398,7 +401,7 @@ class DistributedObject(DistributedObjectBase):
def getCurrentContexts(self):
# Returns a list of the currently outstanding contexts created
# by getCallbackContext().
- return self.__callbacks.keys()
+ return list(self.__callbacks.keys())
def getCallback(self, context):
# Returns the callback that was passed in to the previous
diff --git a/direct/src/distributed/DistributedObjectAI.py b/direct/src/distributed/DistributedObjectAI.py
index 18985e42e1..efe5cd02bf 100644
--- a/direct/src/distributed/DistributedObjectAI.py
+++ b/direct/src/distributed/DistributedObjectAI.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
@@ -56,25 +57,26 @@ class DistributedObjectAI(DistributedObjectBase):
def status(self, indent=0):
"""
print out doId(parentId, zoneId) className
- and conditionally show generated, disabled, neverDisable,
- or cachable
+ and conditionally show generated or deleted
"""
- spaces=' '*(indent+2)
+ spaces = ' ' * (indent + 2)
try:
- print "%s%s:"%(
- ' '*indent, self.__class__.__name__)
- print "%sfrom DistributedObject doId:%s, parent:%s, zone:%s"%(
- spaces,
- self.doId, self.parentId, self.zoneId),
- flags=[]
+ print("%s%s:" % (' ' * indent, self.__class__.__name__))
+
+ flags = []
if self.__generated:
flags.append("generated")
if self.air == None:
flags.append("deleted")
+
+ flagStr = ""
if len(flags):
- print "(%s)"%(" ".join(flags),),
- print
- except Exception, e: print "%serror printing status"%(spaces,), e
+ flagStr = " (%s)" % (" ".join(flags))
+
+ print("%sfrom DistributedObject doId:%s, parent:%s, zone:%s%s" % (
+ spaces, self.doId, self.parentId, self.zoneId, flagStr))
+ except Exception as e:
+ print("%serror printing status %s" % (spaces, e))
def getDeleteEvent(self):
# this is sent just before we get deleted
@@ -347,16 +349,16 @@ class DistributedObjectAI(DistributedObjectBase):
self.air.sendUpdate(self, fieldName, args)
def GetPuppetConnectionChannel(self, doId):
- return doId + (1L << 32)
+ return doId + (1 << 32)
def GetAccountConnectionChannel(self, doId):
- return doId + (3L << 32)
+ return doId + (3 << 32)
def GetAccountIDFromChannelCode(self, channel):
return channel >> 32
def GetAvatarIDFromChannelCode(self, channel):
- return channel & 0xffffffffL
+ return channel & 0xffffffff
def sendUpdateToAvatarId(self, avId, fieldName, args):
assert self.notify.debugStateCall(self)
diff --git a/direct/src/distributed/DistributedObjectBase.py b/direct/src/distributed/DistributedObjectBase.py
index 70a7c567ca..e105e4c891 100755
--- a/direct/src/distributed/DistributedObjectBase.py
+++ b/direct/src/distributed/DistributedObjectBase.py
@@ -22,14 +22,13 @@ class DistributedObjectBase(DirectObject):
"""
print out "doId(parentId, zoneId) className"
"""
- spaces=' '*(indent+2)
+ spaces = ' ' * (indent + 2)
try:
- print "%s%s:"%(
- ' '*indent, self.__class__.__name__)
- print "%sfrom DistributedObject doId:%s, parent:%s, zone:%s"%(
- spaces,
- self.doId, self.parentId, self.zoneId),
- except Exception, e: print "%serror printing status"%(spaces,), e
+ print("%s%s:" % (' ' * indent, self.__class__.__name__))
+ print("%sfrom DistributedObject doId:%s, parent:%s, zone:%s" % (
+ spaces, self.doId, self.parentId, self.zoneId))
+ except Exception as e:
+ print("%serror printing status %s" % (spaces, e))
def getLocation(self):
try:
diff --git a/direct/src/distributed/DistributedObjectGlobalAI.py b/direct/src/distributed/DistributedObjectGlobalAI.py
index 10b80be712..28ce8d2c7d 100755
--- a/direct/src/distributed/DistributedObjectGlobalAI.py
+++ b/direct/src/distributed/DistributedObjectGlobalAI.py
@@ -1,5 +1,5 @@
-from DistributedObjectAI import DistributedObjectAI
+from .DistributedObjectAI import DistributedObjectAI
from direct.directnotify.DirectNotifyGlobal import directNotify
diff --git a/direct/src/distributed/DistributedObjectGlobalUD.py b/direct/src/distributed/DistributedObjectGlobalUD.py
index 191c60c685..ce51d8421c 100755
--- a/direct/src/distributed/DistributedObjectGlobalUD.py
+++ b/direct/src/distributed/DistributedObjectGlobalUD.py
@@ -1,6 +1,6 @@
-from DistributedObjectUD import DistributedObjectUD
+from .DistributedObjectUD import DistributedObjectUD
from direct.directnotify.DirectNotifyGlobal import directNotify
import sys
diff --git a/direct/src/distributed/DistributedObjectOV.py b/direct/src/distributed/DistributedObjectOV.py
index ef3c12dd62..52ed2d13be 100755
--- a/direct/src/distributed/DistributedObjectOV.py
+++ b/direct/src/distributed/DistributedObjectOV.py
@@ -40,22 +40,24 @@ class DistributedObjectOV(DistributedObjectBase):
print out "doId(parentId, zoneId) className"
and conditionally show generated, disabled
"""
- spaces=' '*(indent+2)
+ spaces = ' ' * (indent + 2)
try:
- print "%s%s:"%(
- ' '*indent, self.__class__.__name__)
- print "%sfrom DistributedObjectOV doId:%s, parent:%s, zone:%s"%(
- spaces,
- self.doId, self.parentId, self.zoneId),
- flags=[]
+ print("%s%s:" % (' ' * indent, self.__class__.__name__))
+
+ flags = []
if self.activeState == ESGenerated:
flags.append("generated")
if self.activeState < ESGenerating:
flags.append("disabled")
+
+ flagStr = ""
if len(flags):
- print "(%s)"%(" ".join(flags),),
- print
- except Exception, e: print "%serror printing status"%(spaces,), e
+ flagStr = " (%s)" % (" ".join(flags))
+
+ print("%sfrom DistributedObjectOV doId:%s, parent:%s, zone:%s%s" % (
+ spaces, self.doId, self.parentId, self.zoneId, flagStr))
+ except Exception as e:
+ print("%serror printing status %s" % (spaces, e))
def getDelayDeleteCount(self):
diff --git a/direct/src/distributed/DistributedObjectUD.py b/direct/src/distributed/DistributedObjectUD.py
index 7642cd222b..4309ad7d80 100755
--- a/direct/src/distributed/DistributedObjectUD.py
+++ b/direct/src/distributed/DistributedObjectUD.py
@@ -54,24 +54,26 @@ class DistributedObjectUD(DistributedObjectBase):
def status(self, indent=0):
"""
print out doId(parentId, zoneId) className
- and conditionally show generated, disabled, neverDisable,
- or cachable
+ and conditionally show generated or deleted
"""
spaces = ' ' * (indent + 2)
try:
- print "%s%s:" % (' ' * indent, self.__class__.__name__)
- print ("%sfrom "
- "DistributedObject doId:%s, parent:%s, zone:%s" %
- (spaces, self.doId, self.parentId, self.zoneId)),
+ print("%s%s:" % (' ' * indent, self.__class__.__name__))
+
flags = []
if self.__generated:
flags.append("generated")
if self.air == None:
flags.append("deleted")
+
+ flagStr = ""
if len(flags):
- print "(%s)" % (" ".join(flags),),
- print
- except Exception, e: print "%serror printing status" % (spaces,), e
+ flagStr = " (%s)" % (" ".join(flags))
+
+ print("%sfrom DistributedObject doId:%s, parent:%s, zone:%s%s" % (
+ spaces, self.doId, self.parentId, self.zoneId, flagStr))
+ except Exception as e:
+ print("%serror printing status %s" % (spaces, e))
def getDeleteEvent(self):
# this is sent just before we get deleted
@@ -267,16 +269,16 @@ class DistributedObjectUD(DistributedObjectBase):
self.air.sendUpdate(self, fieldName, args)
def GetPuppetConnectionChannel(self, doId):
- return doId + (1L << 32)
+ return doId + (1 << 32)
def GetAccountConnectionChannel(self, doId):
- return doId + (3L << 32)
+ return doId + (3 << 32)
def GetAccountIDFromChannelCode(self, channel):
return channel >> 32
def GetAvatarIDFromChannelCode(self, channel):
- return channel & 0xffffffffL
+ return channel & 0xffffffff
def sendUpdateToAvatarId(self, avId, fieldName, args):
assert self.notify.debugStateCall(self)
diff --git a/direct/src/distributed/DistributedSmoothNode.py b/direct/src/distributed/DistributedSmoothNode.py
index 34ad0ae52b..cdc2dc034e 100644
--- a/direct/src/distributed/DistributedSmoothNode.py
+++ b/direct/src/distributed/DistributedSmoothNode.py
@@ -1,9 +1,9 @@
"""DistributedSmoothNode module: contains the DistributedSmoothNode class"""
from pandac.PandaModules import *
-from ClockDelta import *
-import DistributedNode
-import DistributedSmoothNodeBase
+from .ClockDelta import *
+from . import DistributedNode
+from . import DistributedSmoothNodeBase
from direct.task.Task import cont
# This number defines our tolerance for out-of-sync telemetry packets.
diff --git a/direct/src/distributed/DistributedSmoothNodeAI.py b/direct/src/distributed/DistributedSmoothNodeAI.py
index 968a7ccfa4..fe8ec19b1c 100755
--- a/direct/src/distributed/DistributedSmoothNodeAI.py
+++ b/direct/src/distributed/DistributedSmoothNodeAI.py
@@ -1,5 +1,5 @@
-import DistributedNodeAI
-import DistributedSmoothNodeBase
+from . import DistributedNodeAI
+from . import DistributedSmoothNodeBase
class DistributedSmoothNodeAI(DistributedNodeAI.DistributedNodeAI,
DistributedSmoothNodeBase.DistributedSmoothNodeBase):
diff --git a/direct/src/distributed/DistributedSmoothNodeBase.py b/direct/src/distributed/DistributedSmoothNodeBase.py
index faeda49115..8f7d1c31e4 100755
--- a/direct/src/distributed/DistributedSmoothNodeBase.py
+++ b/direct/src/distributed/DistributedSmoothNodeBase.py
@@ -1,6 +1,6 @@
"""DistributedSmoothNodeBase module: contains the DistributedSmoothNodeBase class"""
-from ClockDelta import *
+from .ClockDelta import *
from direct.task import Task
from direct.showbase.PythonUtil import randFloat, Enum
from panda3d.direct import CDistributedSmoothNodeBase
diff --git a/direct/src/distributed/DoCollectionManager.py b/direct/src/distributed/DoCollectionManager.py
index 691e84f75a..16bf345f4e 100755
--- a/direct/src/distributed/DoCollectionManager.py
+++ b/direct/src/distributed/DoCollectionManager.py
@@ -117,29 +117,29 @@ class DoCollectionManager:
return 1
def dosByDistance(self):
- objs = self.doId2do.values()
+ objs = list(self.doId2do.values())
objs.sort(cmp=self._compareDistance)
return objs
def doByDistance(self):
objs = self.dosByDistance()
for obj in objs:
- print '%s\t%s\t%s' % (obj.doId, self._getDistanceFromLA(obj),
- obj.dclass.getName())
+ print('%s\t%s\t%s' % (obj.doId, self._getDistanceFromLA(obj),
+ obj.dclass.getName()))
if __debug__:
def printObjects(self):
format="%10s %10s %10s %30s %20s"
title=format%("parentId", "zoneId", "doId", "dclass", "name")
- print title
- print '-'*len(title)
+ print(title)
+ print('-'*len(title))
for distObj in self.doId2do.values():
- print format%(
+ print(format%(
distObj.__dict__.get("parentId"),
distObj.__dict__.get("zoneId"),
distObj.__dict__.get("doId"),
distObj.dclass.getName(),
- distObj.__dict__.get("name"))
+ distObj.__dict__.get("name")))
def _printObjects(self, table):
class2count = {}
@@ -148,14 +148,14 @@ class DoCollectionManager:
class2count.setdefault(className, 0)
class2count[className] += 1
count2classes = invertDictLossless(class2count)
- counts = count2classes.keys()
+ counts = list(count2classes.keys())
counts.sort()
counts.reverse()
for count in counts:
count2classes[count].sort()
for name in count2classes[count]:
- print '%s %s' % (count, name)
- print ''
+ print('%s %s' % (count, name))
+ print('')
def _returnObjects(self, table):
class2count = {}
@@ -165,7 +165,7 @@ class DoCollectionManager:
class2count.setdefault(className, 0)
class2count[className] += 1
count2classes = invertDictLossless(class2count)
- counts = count2classes.keys()
+ counts = list(count2classes.keys())
counts.sort()
counts.reverse()
for count in counts:
@@ -189,12 +189,12 @@ class DoCollectionManager:
def printObjectCount(self):
# print object counts by distributed object type
- print '==== OBJECT COUNT ===='
+ print('==== OBJECT COUNT ====')
if self.hasOwnerView():
- print '== doId2do'
+ print('== doId2do')
self._printObjects(self.getDoTable(ownerView=False))
if self.hasOwnerView():
- print '== doId2ownerView'
+ print('== doId2ownerView')
self._printObjects(self.getDoTable(ownerView=True))
def getDoList(self, parentId, zoneId=None, classType=None):
diff --git a/direct/src/distributed/DoInterestManager.py b/direct/src/distributed/DoInterestManager.py
index ed72de562c..a81000a788 100755
--- a/direct/src/distributed/DoInterestManager.py
+++ b/direct/src/distributed/DoInterestManager.py
@@ -8,10 +8,10 @@ p.s. A great deal of this code is just code moved from ClientRepository.py.
"""
from pandac.PandaModules import *
-from MsgTypes import *
+from .MsgTypes import *
from direct.showbase.PythonUtil import *
from direct.showbase import DirectObject
-from PyDatagram import PyDatagram
+from .PyDatagram import PyDatagram
from direct.directnotify.DirectNotifyGlobal import directNotify
import types
from direct.showbase.PythonUtil import report
@@ -184,8 +184,8 @@ class DoInterestManager(DirectObject.DirectObject):
DoInterestManager._interests[handle] = InterestState(
description, InterestState.StateActive, contextId, event, parentId, zoneIdList, self._completeEventCount)
if self.__verbose():
- print 'CR::INTEREST.addInterest(handle=%s, parentId=%s, zoneIdList=%s, description=%s, event=%s)' % (
- handle, parentId, zoneIdList, description, event)
+ print('CR::INTEREST.addInterest(handle=%s, parentId=%s, zoneIdList=%s, description=%s, event=%s)' % (
+ handle, parentId, zoneIdList, description, event))
self._sendAddInterest(handle, contextId, parentId, zoneIdList, description)
if event:
messenger.send(self._getAddInterestEvent(), [event])
@@ -218,8 +218,8 @@ class DoInterestManager(DirectObject.DirectObject):
DoInterestManager._interests[handle] = InterestState(
description, InterestState.StateActive, 0, None, parentId, zoneIdList, self._completeEventCount, True)
if self.__verbose():
- print 'CR::INTEREST.addInterest(handle=%s, parentId=%s, zoneIdList=%s, description=%s)' % (
- handle, parentId, zoneIdList, description)
+ print('CR::INTEREST.addInterest(handle=%s, parentId=%s, zoneIdList=%s, description=%s)' % (
+ handle, parentId, zoneIdList, description))
assert self.printInterestsIfDebug()
return InterestHandle(handle)
@@ -266,8 +266,8 @@ class DoInterestManager(DirectObject.DirectObject):
if not event:
self._considerRemoveInterest(handle)
if self.__verbose():
- print 'CR::INTEREST.removeInterest(handle=%s, event=%s)' % (
- handle, event)
+ print('CR::INTEREST.removeInterest(handle=%s, event=%s)' % (
+ handle, event))
else:
DoInterestManager.notify.warning(
"removeInterest: handle not found: %s" % (handle))
@@ -302,7 +302,7 @@ class DoInterestManager(DirectObject.DirectObject):
intState.state = InterestState.StatePendingDel
self._considerRemoveInterest(handle)
if self.__verbose():
- print 'CR::INTEREST.removeAutoInterest(handle=%s)' % (handle)
+ print('CR::INTEREST.removeAutoInterest(handle=%s)' % (handle))
else:
DoInterestManager.notify.warning(
"removeInterest: handle not found: %s" % (handle))
@@ -357,8 +357,8 @@ class DoInterestManager(DirectObject.DirectObject):
DoInterestManager._interests[handle].addEvent(event)
if self.__verbose():
- print 'CR::INTEREST.alterInterest(handle=%s, parentId=%s, zoneIdList=%s, description=%s, event=%s)' % (
- handle, parentId, zoneIdList, description, event)
+ print('CR::INTEREST.alterInterest(handle=%s, parentId=%s, zoneIdList=%s, description=%s, event=%s)' % (
+ handle, parentId, zoneIdList, description, event))
self._sendAddInterest(handle, contextId, parentId, zoneIdList, description, action='modify')
exists = True
assert self.printInterestsIfDebug()
@@ -445,24 +445,24 @@ class DoInterestManager(DirectObject.DirectObject):
DoInterestManager._debug_maxDescriptionLen, len(description))
def printInterestHistory(self):
- print "***************** Interest History *************"
+ print("***************** Interest History *************")
format = '%9s %' + str(DoInterestManager._debug_maxDescriptionLen) + 's %6s %6s %9s %s'
- print format % (
+ print(format % (
"Action", "Description", "Handle", "Context", "ParentId",
- "ZoneIdList")
+ "ZoneIdList"))
for i in DoInterestManager._debug_interestHistory:
- print format % tuple(i)
- print "Note: interests with a Context of 0 do not get" \
- " done/finished notices."
+ print(format % tuple(i))
+ print("Note: interests with a Context of 0 do not get" \
+ " done/finished notices.")
def printInterestSets(self):
- print "******************* Interest Sets **************"
+ print("******************* Interest Sets **************")
format = '%6s %' + str(DoInterestManager._debug_maxDescriptionLen) + 's %11s %11s %8s %8s %8s'
- print format % (
+ print(format % (
"Handle", "Description",
"ParentId", "ZoneIdList",
"State", "Context",
- "Event")
+ "Event"))
for id, state in DoInterestManager._interests.items():
if len(state.events) == 0:
event = ''
@@ -470,11 +470,11 @@ class DoInterestManager(DirectObject.DirectObject):
event = state.events[0]
else:
event = state.events
- print format % (id, state.desc,
+ print(format % (id, state.desc,
state.parentId, state.zoneIdList,
state.state, state.context,
- event)
- print "************************************************"
+ event))
+ print("************************************************")
def printInterests(self):
self.printInterestHistory()
@@ -492,7 +492,7 @@ class DoInterestManager(DirectObject.DirectObject):
"""
assert DoInterestManager.notify.debugCall()
if __debug__:
- if isinstance(zoneIdList, types.ListType):
+ if isinstance(zoneIdList, list):
zoneIdList.sort()
if action is None:
action = 'add'
@@ -507,7 +507,7 @@ class DoInterestManager(DirectObject.DirectObject):
datagram.addUint16(handle)
datagram.addUint32(contextId)
datagram.addUint32(parentId)
- if isinstance(zoneIdList, types.ListType):
+ if isinstance(zoneIdList, list):
vzl = list(zoneIdList)
vzl.sort()
uniqueElements(vzl)
@@ -585,7 +585,7 @@ class DoInterestManager(DirectObject.DirectObject):
handle = di.getUint16()
contextId = di.getUint32()
if self.__verbose():
- print 'CR::INTEREST.interestDone(handle=%s)' % handle
+ print('CR::INTEREST.interestDone(handle=%s)' % handle)
DoInterestManager.notify.debug(
"handleInterestDoneMessage--> Received handle %s, context %s" % (
handle, contextId))
diff --git a/direct/src/distributed/GridChild.py b/direct/src/distributed/GridChild.py
index 78b35f8c67..462c4d841e 100755
--- a/direct/src/distributed/GridChild.py
+++ b/direct/src/distributed/GridChild.py
@@ -106,7 +106,7 @@ class GridChild:
self._gridInterests[gridDoId] = [None,zoneId]
def getGridInterestIds(self):
- return self._gridInterests.keys()
+ return list(self._gridInterests.keys())
def getGridInterestZoneId(self,gridDoId):
return self._gridInterests.get(gridDoId,[None,None])[1]
diff --git a/direct/src/distributed/NetMessenger.py b/direct/src/distributed/NetMessenger.py
index 0d24e2a1ff..03c666d2ea 100755
--- a/direct/src/distributed/NetMessenger.py
+++ b/direct/src/distributed/NetMessenger.py
@@ -1,10 +1,14 @@
-from cPickle import dumps, loads
-
from direct.directnotify import DirectNotifyGlobal
from direct.distributed.PyDatagram import PyDatagram
from direct.showbase.Messenger import Messenger
+import sys
+if sys.version_info >= (3, 0):
+ from pickle import dumps, loads
+else:
+ from cPickle import dumps, loads
+
# Messages do not need to be in the MESSAGE_TYPES list.
# This is just an optimization. If the message is found
diff --git a/direct/src/distributed/OldClientRepository.py b/direct/src/distributed/OldClientRepository.py
index 2e996cc5df..daeb4af628 100644
--- a/direct/src/distributed/OldClientRepository.py
+++ b/direct/src/distributed/OldClientRepository.py
@@ -1,6 +1,6 @@
"""OldClientRepository module: contains the OldClientRepository class"""
-from ClientRepositoryBase import *
+from .ClientRepositoryBase import *
class OldClientRepository(ClientRepositoryBase):
"""
@@ -126,7 +126,7 @@ class OldClientRepository(ClientRepositoryBase):
def handleDatagram(self, di):
if self.notify.getDebug():
- print "ClientRepository received datagram:"
+ print("ClientRepository received datagram:")
di.getDatagram().dumpHex(ostream)
msgType = self.getMsgType()
diff --git a/direct/src/distributed/ParentMgr.py b/direct/src/distributed/ParentMgr.py
index 434c3cbd64..6e52b1097b 100644
--- a/direct/src/distributed/ParentMgr.py
+++ b/direct/src/distributed/ParentMgr.py
@@ -2,7 +2,7 @@
from direct.directnotify import DirectNotifyGlobal
from direct.showbase.PythonUtil import isDefaultValue
-import types
+
class ParentMgr:
# This is now used on the AI as well.
@@ -90,7 +90,7 @@ class ParentMgr:
if isDefaultValue(token):
self.notify.error('parent token (for %s) cannot be a default value (%s)' % (repr(parent), token))
- if type(token) is types.IntType:
+ if type(token) is int:
if token > 0xFFFFFFFF:
self.notify.error('parent token %s (for %s) is out of uint32 range' % (token, repr(parent)))
diff --git a/direct/src/distributed/ServerRepository.py b/direct/src/distributed/ServerRepository.py
index 7dcd5add72..11cec06ac3 100644
--- a/direct/src/distributed/ServerRepository.py
+++ b/direct/src/distributed/ServerRepository.py
@@ -5,9 +5,7 @@ from direct.distributed.MsgTypesCMU import *
from direct.task import Task
from direct.directnotify import DirectNotifyGlobal
from direct.distributed.PyDatagram import PyDatagram
-from direct.distributed.PyDatagramIterator import PyDatagramIterator
-import time
-import types
+
class ServerRepository:
@@ -153,7 +151,7 @@ class ServerRepository:
for client in flush:
client.connection.flush()
- return task.again
+ return Task.again
def setTcpHeaderSize(self, headerSize):
"""Sets the header size of TCP packets. At the present, legal
@@ -299,7 +297,7 @@ class ServerRepository:
retVal = self.qcl.getNewConnection(rendezvous, netAddress,
newConnection)
if not retVal:
- return task.cont
+ return Task.cont
# Crazy dereferencing
newConnection = newConnection.p()
@@ -321,13 +319,13 @@ class ServerRepository:
self.lastConnection = newConnection
self.sendDoIdRange(client)
- return task.cont
+ return Task.cont
def readerPollUntilEmpty(self, task):
""" continuously polls for new messages on the server """
while self.readerPollOnce():
pass
- return task.cont
+ return Task.cont
def readerPollOnce(self):
""" checks for available messages to the server """
@@ -691,7 +689,7 @@ class ServerRepository:
for client in self.clientsByConnection.values():
if not self.qcr.isConnectionOk(client.connection):
self.handleClientDisconnect(client)
- return task.cont
+ return Task.cont
def sendToZoneExcept(self, zoneId, datagram, exceptionList):
"""sends a message to everyone who has interest in the
diff --git a/direct/src/distributed/TimeManagerAI.py b/direct/src/distributed/TimeManagerAI.py
index a9aed1222e..c912394326 100644
--- a/direct/src/distributed/TimeManagerAI.py
+++ b/direct/src/distributed/TimeManagerAI.py
@@ -18,6 +18,6 @@ class TimeManagerAI(DistributedObjectAI.DistributedObjectAI):
"""
timestamp = globalClockDelta.getRealNetworkTime(bits=32)
requesterId = self.air.getAvatarIdFromSender()
- print "requestServerTime from %s" % (requesterId)
+ print("requestServerTime from %s" % (requesterId))
self.sendUpdateToAvatarId(requesterId, "serverTime",
[context, timestamp])
diff --git a/direct/src/doc/howto.adjust b/direct/src/doc/howto.adjust
index 5862e708a2..cf6925ad2f 100644
--- a/direct/src/doc/howto.adjust
+++ b/direct/src/doc/howto.adjust
@@ -52,7 +52,10 @@ of the slider to change settings. Click on:
You can pack multiple sliders into a single panel:
-from Tkinter import *
+if sys.version_info >= (3, 0):
+ from tkinter import *
+else:
+ from Tkinter import *
def func1(x):
print '1:', x
diff --git a/direct/src/extensions_native/CInterval_extensions.py b/direct/src/extensions_native/CInterval_extensions.py
index eb82fc50f3..9ed7ff48a0 100644
--- a/direct/src/extensions_native/CInterval_extensions.py
+++ b/direct/src/extensions_native/CInterval_extensions.py
@@ -63,14 +63,17 @@ def popupControls(self, tl = None):
import math
# Don't use a regular import, to prevent ModuleFinder from picking
# it up as a dependency when building a .p3d package.
- import importlib
+ import importlib, sys
EntryScale = importlib.import_module('direct.tkwidgets.EntryScale')
- Tkinter = importlib.import_module('Tkinter')
+ if sys.version_info >= (3, 0):
+ tkinter = importlib.import_module('tkinter')
+ else:
+ tkinter = importlib.import_module('Tkinter')
if tl == None:
- tl = Tkinter.Toplevel()
+ tl = tkinter.Toplevel()
tl.title('Interval Controls')
- outerFrame = Tkinter.Frame(tl)
+ outerFrame = tkinter.Frame(tl)
def entryScaleCommand(t, s=self):
s.setT(t)
s.pause()
@@ -79,8 +82,8 @@ def popupControls(self, tl = None):
min = 0, max = math.floor(self.getDuration() * 100) / 100,
command = entryScaleCommand)
es.set(self.getT(), fCommand = 0)
- es.pack(expand = 1, fill = Tkinter.X)
- bf = Tkinter.Frame(outerFrame)
+ es.pack(expand = 1, fill = tkinter.X)
+ bf = tkinter.Frame(outerFrame)
# Jump to start and end
def toStart(s=self, es=es):
s.setT(0.0)
@@ -88,23 +91,23 @@ def popupControls(self, tl = None):
def toEnd(s=self):
s.setT(s.getDuration())
s.pause()
- jumpToStart = Tkinter.Button(bf, text = '<<', command = toStart)
+ jumpToStart = tkinter.Button(bf, text = '<<', command = toStart)
# Stop/play buttons
def doPlay(s=self, es=es):
s.resume(es.get())
- stop = Tkinter.Button(bf, text = 'Stop',
+ stop = tkinter.Button(bf, text = 'Stop',
command = lambda s=self: s.pause())
- play = Tkinter.Button(
+ play = tkinter.Button(
bf, text = 'Play',
command = doPlay)
- jumpToEnd = Tkinter.Button(bf, text = '>>', command = toEnd)
- jumpToStart.pack(side = Tkinter.LEFT, expand = 1, fill = Tkinter.X)
- play.pack(side = Tkinter.LEFT, expand = 1, fill = Tkinter.X)
- stop.pack(side = Tkinter.LEFT, expand = 1, fill = Tkinter.X)
- jumpToEnd.pack(side = Tkinter.LEFT, expand = 1, fill = Tkinter.X)
- bf.pack(expand = 1, fill = Tkinter.X)
- outerFrame.pack(expand = 1, fill = Tkinter.X)
+ jumpToEnd = tkinter.Button(bf, text = '>>', command = toEnd)
+ jumpToStart.pack(side = tkinter.LEFT, expand = 1, fill = tkinter.X)
+ play.pack(side = tkinter.LEFT, expand = 1, fill = tkinter.X)
+ stop.pack(side = tkinter.LEFT, expand = 1, fill = tkinter.X)
+ jumpToEnd.pack(side = tkinter.LEFT, expand = 1, fill = tkinter.X)
+ bf.pack(expand = 1, fill = tkinter.X)
+ outerFrame.pack(expand = 1, fill = tkinter.X)
# Add function to update slider during setT calls
def update(t, es=es):
es.set(t, fCommand = 0)
diff --git a/direct/src/extensions_native/NodePath_extensions.py b/direct/src/extensions_native/NodePath_extensions.py
index 7383ae1e06..4c388becf7 100644
--- a/direct/src/extensions_native/NodePath_extensions.py
+++ b/direct/src/extensions_native/NodePath_extensions.py
@@ -690,7 +690,7 @@ def subdivideCollisions(self, numSolidsInLeaves):
# this CollisionNode doesn't need to be split
continue
solids = []
- for i in xrange(numSolids):
+ for i in range(numSolids):
solids.append(node.getSolid(i))
# recursively subdivide the solids into a spatial binary tree
solidTree = self.r_subdivideCollisions(solids, numSolidsInLeaves)
@@ -743,7 +743,7 @@ def r_subdivideCollisions(self, solids, numSolidsInLeaves):
midY += maxExtent
if extentZ < (maxExtent * .75) or extentZ > (maxExtent * 1.25):
midZ += maxExtent
- for i in xrange(len(solids)):
+ for i in range(len(solids)):
origin = origins[i]
x = origin.getX(); y = origin.getY(); z = origin.getZ()
if x < midX:
diff --git a/direct/src/extensions_native/extension_native_helpers.py b/direct/src/extensions_native/extension_native_helpers.py
index d248f1f193..e9648e7440 100644
--- a/direct/src/extensions_native/extension_native_helpers.py
+++ b/direct/src/extensions_native/extension_native_helpers.py
@@ -1,7 +1,6 @@
-### Tools
__all__ = ["Dtool_ObjectToDict", "Dtool_funcToMethod"]
-import imp, sys, os
+import sys
def Dtool_ObjectToDict(cls, name, obj):
cls.DtoolClassDict[name] = obj
diff --git a/direct/src/filter/CommonFilters.py b/direct/src/filter/CommonFilters.py
index c861561066..9cfe72d987 100644
--- a/direct/src/filter/CommonFilters.py
+++ b/direct/src/filter/CommonFilters.py
@@ -15,7 +15,7 @@ clunky approach. - Josh
"""
-from FilterManager import FilterManager
+from .FilterManager import FilterManager
from panda3d.core import LVecBase4, LPoint2
from panda3d.core import Filename
from panda3d.core import AuxBitplaneAttrib
diff --git a/direct/src/fsm/ClassicFSM.py b/direct/src/fsm/ClassicFSM.py
index a0d6045c5f..847cf290db 100644
--- a/direct/src/fsm/ClassicFSM.py
+++ b/direct/src/fsm/ClassicFSM.py
@@ -10,18 +10,15 @@ existing code. New code should use the FSM module instead.
from direct.directnotify.DirectNotifyGlobal import directNotify
from direct.showbase.DirectObject import DirectObject
-import types
import weakref
if __debug__:
- _debugFsms={}
+ _debugFsms = {}
def printDebugFsmList():
global _debugFsms
- keys=_debugFsms.keys()
- keys.sort()
- for k in keys:
- print k, _debugFsms[k]()
- __builtins__['debugFsmList']=printDebugFsmList
+ for k in sorted(_debugFsms.keys()):
+ print("%s %s" % (k, _debugFsms[k]()))
+ __builtins__['debugFsmList'] = printDebugFsmList
class ClassicFSM(DirectObject):
"""
@@ -123,7 +120,7 @@ class ClassicFSM(DirectObject):
self.__name = name
def getStates(self):
- return self.__states.values()
+ return list(self.__states.values())
def setStates(self, states):
"""setStates(self, State[])"""
@@ -251,7 +248,7 @@ class ClassicFSM(DirectObject):
(self.__name))
self.__currentState = self.__initialState
- if isinstance(aStateName, types.StringType):
+ if isinstance(aStateName, str):
aState = self.getStateNamed(aStateName)
else:
# Allow the caller to pass in a state in itself, not just
@@ -342,7 +339,7 @@ class ClassicFSM(DirectObject):
(self.__name))
self.__currentState = self.__initialState
- if isinstance(aStateName, types.StringType):
+ if isinstance(aStateName, str):
aState = self.getStateNamed(aStateName)
else:
# Allow the caller to pass in a state in itself, not just
diff --git a/direct/src/fsm/FSM.py b/direct/src/fsm/FSM.py
index 2f9967783e..a62bede3f0 100644
--- a/direct/src/fsm/FSM.py
+++ b/direct/src/fsm/FSM.py
@@ -9,7 +9,7 @@ from direct.showbase.DirectObject import DirectObject
from direct.directnotify import DirectNotifyGlobal
from direct.showbase import PythonUtil
from direct.stdpy.threading import RLock
-import types
+
class FSMException(Exception):
pass
@@ -238,7 +238,7 @@ class FSM(DirectObject):
self.fsmLock.acquire()
try:
- assert isinstance(request, types.StringTypes)
+ assert isinstance(request, str)
self.notify.debug("%s.forceTransition(%s, %s" % (
self.name, request, str(args)[1:]))
@@ -266,7 +266,7 @@ class FSM(DirectObject):
self.fsmLock.acquire()
try:
- assert isinstance(request, types.StringTypes)
+ assert isinstance(request, str)
self.notify.debug("%s.demand(%s, %s" % (
self.name, request, str(args)[1:]))
if not self.state:
@@ -305,14 +305,14 @@ class FSM(DirectObject):
self.fsmLock.acquire()
try:
- assert isinstance(request, types.StringTypes)
+ assert isinstance(request, str)
self.notify.debug("%s.request(%s, %s" % (
self.name, request, str(args)[1:]))
filter = self.getCurrentFilter()
result = list(filter(request, args))
if result:
- if isinstance(result, types.StringTypes):
+ if isinstance(result, str):
# If the return value is a string, it's just the name
# of the state. Wrap it in a tuple for consistency.
result = (result,) + args
diff --git a/direct/src/fsm/FourState.py b/direct/src/fsm/FourState.py
index 790439e901..df653825f9 100755
--- a/direct/src/fsm/FourState.py
+++ b/direct/src/fsm/FourState.py
@@ -6,8 +6,8 @@ __all__ = ['FourState']
from direct.directnotify import DirectNotifyGlobal
#import DistributedObject
-import ClassicFSM
-import State
+from . import ClassicFSM
+from . import State
class FourState:
@@ -122,7 +122,7 @@ class FourState:
}
self.stateIndex = 0
self.fsm = ClassicFSM.ClassicFSM('FourState',
- self.states.values(),
+ list(self.states.values()),
# Initial State
names[0],
# Final State
diff --git a/direct/src/fsm/FourStateAI.py b/direct/src/fsm/FourStateAI.py
index 814d8f057a..6f5ff8d966 100755
--- a/direct/src/fsm/FourStateAI.py
+++ b/direct/src/fsm/FourStateAI.py
@@ -6,8 +6,8 @@ __all__ = ['FourStateAI']
from direct.directnotify import DirectNotifyGlobal
#import DistributedObjectAI
-import ClassicFSM
-import State
+from . import ClassicFSM
+from . import State
from direct.task import Task
@@ -128,7 +128,7 @@ class FourStateAI:
[names[1]]),
}
self.fsm = ClassicFSM.ClassicFSM('FourState',
- self.states.values(),
+ list(self.states.values()),
# Initial State
names[0],
# Final State
diff --git a/direct/src/fsm/SampleFSM.py b/direct/src/fsm/SampleFSM.py
index b3b6fa88ed..9db513afa2 100644
--- a/direct/src/fsm/SampleFSM.py
+++ b/direct/src/fsm/SampleFSM.py
@@ -2,9 +2,8 @@
__all__ = ['ClassicStyle', 'NewStyle', 'ToonEyes']
-import FSM
+from . import FSM
from direct.task import Task
-import string
class ClassicStyle(FSM.FSM):
@@ -19,61 +18,61 @@ class ClassicStyle(FSM.FSM):
}
def enterRed(self):
- print "enterRed(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("enterRed(self, '%s', '%s')" % (self.oldState, self.newState))
def exitRed(self):
- print "exitRed(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("exitRed(self, '%s', '%s')" % (self.oldState, self.newState))
def enterYellow(self):
- print "enterYellow(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("enterYellow(self, '%s', '%s')" % (self.oldState, self.newState))
def exitYellow(self):
- print "exitYellow(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("exitYellow(self, '%s', '%s')" % (self.oldState, self.newState))
def enterGreen(self):
- print "enterGreen(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("enterGreen(self, '%s', '%s')" % (self.oldState, self.newState))
def exitGreen(self):
- print "exitGreen(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("exitGreen(self, '%s', '%s')" % (self.oldState, self.newState))
class NewStyle(FSM.FSM):
def enterRed(self):
- print "enterRed(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("enterRed(self, '%s', '%s')" % (self.oldState, self.newState))
def filterRed(self, request, args):
- print "filterRed(self, '%s', %s)" % (request, args)
+ print("filterRed(self, '%s', %s)" % (request, args))
if request == 'advance':
return 'Green'
return self.defaultFilter(request, args)
def exitRed(self):
- print "exitRed(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("exitRed(self, '%s', '%s')" % (self.oldState, self.newState))
def enterYellow(self):
- print "enterYellow(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("enterYellow(self, '%s', '%s')" % (self.oldState, self.newState))
def filterYellow(self, request, args):
- print "filterYellow(self, '%s', %s)" % (request, args)
+ print("filterYellow(self, '%s', %s)" % (request, args))
if request == 'advance':
return 'Red'
return self.defaultFilter(request, args)
def exitYellow(self):
- print "exitYellow(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("exitYellow(self, '%s', '%s')" % (self.oldState, self.newState))
def enterGreen(self):
- print "enterGreen(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("enterGreen(self, '%s', '%s')" % (self.oldState, self.newState))
def filterGreen(self, request, args):
- print "filterGreen(self, '%s', %s)" % (request, args)
+ print("filterGreen(self, '%s', %s)" % (request, args))
if request == 'advance':
return 'Yellow'
return self.defaultFilter(request, args)
def exitGreen(self):
- print "exitGreen(self, '%s', '%s')" % (self.oldState, self.newState)
+ print("exitGreen(self, '%s', '%s')" % (self.oldState, self.newState))
class ToonEyes(FSM.FSM):
@@ -88,14 +87,14 @@ class ToonEyes(FSM.FSM):
def defaultFilter(self, request, args):
# The default filter accepts any direct state request (these
# start with a capital letter).
- if request[0] in string.uppercase:
+ if request[0].isupper():
return request
# Unexpected command requests are quietly ignored.
return None
def enterOpen(self):
- print "swap in eyes open model"
+ print("swap in eyes open model")
def filterOpen(self, request, args):
if request == 'blink':
@@ -109,7 +108,7 @@ class ToonEyes(FSM.FSM):
return Task.done
def enterClosed(self):
- print "swap in eyes closed model"
+ print("swap in eyes closed model")
def filterClosed(self, request, args):
if request == 'unblink':
@@ -117,7 +116,7 @@ class ToonEyes(FSM.FSM):
return self.defaultFilter(request, args)
def enterSurprised(self):
- print "swap in eyes surprised model"
+ print("swap in eyes surprised model")
def enterOff(self):
taskMgr.remove(self.__unblinkName)
diff --git a/direct/src/fsm/State.py b/direct/src/fsm/State.py
index 44a17080f8..3842b0844b 100644
--- a/direct/src/fsm/State.py
+++ b/direct/src/fsm/State.py
@@ -199,7 +199,7 @@ class State(DirectObject):
self.__enterChildren(argList)
if (self.__enterFunc != None):
- apply(self.__enterFunc, argList)
+ self.__enterFunc(*argList)
def exit(self, argList=[]):
"""
@@ -210,7 +210,7 @@ class State(DirectObject):
# call exit function if it exists
if (self.__exitFunc != None):
- apply(self.__exitFunc, argList)
+ self.__exitFunc(*argList)
def __str__(self):
return "State: name = %s, enter = %s, exit = %s, trans = %s, children = %s" %\
diff --git a/direct/src/fsm/StateData.py b/direct/src/fsm/StateData.py
index 82ce729d93..9223d3c12c 100644
--- a/direct/src/fsm/StateData.py
+++ b/direct/src/fsm/StateData.py
@@ -5,7 +5,6 @@ __all__ = ['StateData']
from direct.directnotify.DirectNotifyGlobal import directNotify
from direct.showbase.DirectObject import DirectObject
-from direct.directnotify import DirectNotifyGlobal
class StateData(DirectObject):
"""
diff --git a/direct/src/fsm/StatePush.py b/direct/src/fsm/StatePush.py
index 0d30a8c3f8..fe0f496158 100755
--- a/direct/src/fsm/StatePush.py
+++ b/direct/src/fsm/StatePush.py
@@ -16,8 +16,8 @@ class PushesStateChanges:
def destroy(self):
if len(self._subscribers) != 0:
- raise '%s object still has subscribers in destroy(): %s' % (
- self.__class__.__name__, self._subscribers)
+ raise Exception('%s object still has subscribers in destroy(): %s' % (
+ self.__class__.__name__, self._subscribers))
del self._subscribers
del self._value
@@ -154,7 +154,7 @@ class ReceivesMultipleStateChanges:
self._source2key = {}
def destroy(self):
- keys = self._key2source.keys()
+ keys = list(self._key2source.keys())
for key in keys:
self._unsubscribe(key)
del self._key2source
@@ -202,15 +202,14 @@ class FunctionCall(ReceivesMultipleStateChanges, PushesStateChanges):
# the value of arguments that push state
self._bakedArgs = []
self._bakedKargs = {}
- for i in xrange(len(self._args)):
+ for i, arg in enumerate(self._args):
key = i
- arg = self._args[i]
if isinstance(arg, PushesStateChanges):
self._bakedArgs.append(arg.getState())
self._subscribeTo(arg, key)
else:
self._bakedArgs.append(self._args[i])
- for key, arg in self._kArgs.iteritems():
+ for key, arg in self._kArgs.items():
if isinstance(arg, PushesStateChanges):
self._bakedKargs[key] = arg.getState()
self._subscribeTo(arg, key)
diff --git a/direct/src/gui/DirectButton.py b/direct/src/gui/DirectButton.py
index f5dcee7413..87077d20a0 100644
--- a/direct/src/gui/DirectButton.py
+++ b/direct/src/gui/DirectButton.py
@@ -3,8 +3,8 @@
__all__ = ['DirectButton']
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectFrame import *
+from . import DirectGuiGlobals as DGG
+from .DirectFrame import *
class DirectButton(DirectFrame):
"""
@@ -100,7 +100,7 @@ class DirectButton(DirectFrame):
def commandFunc(self, event):
if self['command']:
# Pass any extra args to command
- apply(self['command'], self['extraArgs'])
+ self['command'](*self['extraArgs'])
def setClickSound(self):
clickSound = self['clickSound']
diff --git a/direct/src/gui/DirectCheckBox.py b/direct/src/gui/DirectCheckBox.py
index e0e2f8dc24..26b561edaf 100755
--- a/direct/src/gui/DirectCheckBox.py
+++ b/direct/src/gui/DirectCheckBox.py
@@ -55,5 +55,5 @@ class DirectCheckBox(DirectButton):
if self['command']:
# Pass any extra args to command
- apply(self['command'], [self['isChecked']] + self['extraArgs'])
+ self['command'](*[self['isChecked']] + self['extraArgs'])
diff --git a/direct/src/gui/DirectCheckButton.py b/direct/src/gui/DirectCheckButton.py
index 5212031600..3df28a0730 100644
--- a/direct/src/gui/DirectCheckButton.py
+++ b/direct/src/gui/DirectCheckButton.py
@@ -3,8 +3,8 @@
__all__ = ['DirectCheckButton']
from panda3d.core import *
-from DirectButton import *
-from DirectLabel import *
+from .DirectButton import *
+from .DirectLabel import *
class DirectCheckButton(DirectButton):
"""
@@ -169,7 +169,7 @@ class DirectCheckButton(DirectButton):
if self['command']:
# Pass any extra args to command
- apply(self['command'], [self['indicatorValue']] + self['extraArgs'])
+ self['command'](*[self['indicatorValue']] + self['extraArgs'])
def setIndicatorValue(self):
self.component('indicator').guiItem.setState(self['indicatorValue'])
diff --git a/direct/src/gui/DirectDialog.py b/direct/src/gui/DirectDialog.py
index b1d245b1b1..039092c511 100644
--- a/direct/src/gui/DirectDialog.py
+++ b/direct/src/gui/DirectDialog.py
@@ -3,9 +3,9 @@
__all__ = ['findDialog', 'cleanupDialog', 'DirectDialog', 'OkDialog', 'OkCancelDialog', 'YesNoDialog', 'YesNoCancelDialog', 'RetryCancelDialog']
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectFrame import *
-from DirectButton import *
+from . import DirectGuiGlobals as DGG
+from .DirectFrame import *
+from .DirectButton import *
import types
def findDialog(uniqueName):
@@ -186,8 +186,8 @@ class DirectDialog(DirectFrame):
bindList = zip(self.buttonList, self['buttonHotKeyList'],
self['buttonValueList'])
for button, hotKey, value in bindList:
- if ((type(hotKey) == types.ListType) or
- (type(hotKey) == types.TupleType)):
+ if ((type(hotKey) == list) or
+ (type(hotKey) == tuple)):
for key in hotKey:
button.bind('press-' + key + '-', self.buttonCommand,
extraArgs = [value])
@@ -274,12 +274,12 @@ class DirectDialog(DirectFrame):
scale = self['button_scale']
# Can either be a Vec3 or a tuple of 3 values
if (isinstance(scale, Vec3) or
- (type(scale) == types.ListType) or
- (type(scale) == types.TupleType)):
+ (type(scale) == list) or
+ (type(scale) == tuple)):
sx = scale[0]
sz = scale[2]
- elif ((type(scale) == types.IntType) or
- (type(scale) == types.FloatType)):
+ elif ((type(scale) == int) or
+ (type(scale) == float)):
sx = sz = scale
else:
sx = sz = 1
diff --git a/direct/src/gui/DirectEntry.py b/direct/src/gui/DirectEntry.py
index ceddf741f7..45733b7c35 100644
--- a/direct/src/gui/DirectEntry.py
+++ b/direct/src/gui/DirectEntry.py
@@ -3,10 +3,10 @@
__all__ = ['DirectEntry']
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectFrame import *
-from OnscreenText import OnscreenText
-import string,types
+from . import DirectGuiGlobals as DGG
+from .DirectFrame import *
+from .OnscreenText import OnscreenText
+import sys
# import this to make sure it gets pulled into the publish
import encodings.utf_8
from direct.showbase.DirectObject import DirectObject
@@ -181,12 +181,12 @@ class DirectEntry(DirectFrame):
def commandFunc(self, event):
if self['command']:
# Pass any extra args to command
- apply(self['command'], [self.get()] + self['extraArgs'])
+ self['command'](*[self.get()] + self['extraArgs'])
def failedCommandFunc(self, event):
if self['failedCommand']:
# Pass any extra args
- apply(self['failedCommand'], [self.get()] + self['failedExtraArgs'])
+ self['failedCommand'](*[self.get()] + self['failedExtraArgs'])
def autoCapitalizeFunc(self):
if self['autoCapitalize']:
@@ -198,7 +198,7 @@ class DirectEntry(DirectFrame):
def focusInCommandFunc(self):
if self['focusInCommand']:
- apply(self['focusInCommand'], self['focusInExtraArgs'])
+ self['focusInCommand'](*self['focusInExtraArgs'])
if self['autoCapitalize']:
self.accept(self.guiItem.getTypeEvent(), self._handleTyping)
self.accept(self.guiItem.getEraseEvent(), self._handleErasing)
@@ -216,14 +216,13 @@ class DirectEntry(DirectFrame):
wordSoFar = ''
# track whether the previous character was part of a word or not
wasNonWordChar = True
- for i in xrange(len(name)):
- character = name[i]
+ for i, character in enumerate(name):
# test to see if we are between words
# - Count characters that can't be capitalized as a break between words
# This assumes that string.lower and string.upper will return different
# values for all unicode letters.
# - Don't count apostrophes as a break between words
- if ((string.lower(character) == string.upper(character)) and (character != "'")):
+ if character.lower() == character.upper() and character != "'":
# we are between words
wordSoFar = ''
wasNonWordChar = True
@@ -232,7 +231,7 @@ class DirectEntry(DirectFrame):
if wasNonWordChar:
# first letter of a word, capitalize it unconditionally;
capitalize = True
- elif (character == string.upper(character) and
+ elif (character == character.upper() and
len(self.autoCapitalizeAllowPrefixes) and
wordSoFar in self.autoCapitalizeAllowPrefixes):
# first letter after one of the prefixes, allow it to be capitalized
@@ -243,9 +242,9 @@ class DirectEntry(DirectFrame):
capitalize = True
if capitalize:
# allow this letter to remain capitalized
- character = string.upper(character)
+ character = character.upper()
else:
- character = string.lower(character)
+ character = character.lower()
wordSoFar += character
wasNonWordChar = False
capName += character
@@ -253,7 +252,7 @@ class DirectEntry(DirectFrame):
def focusOutCommandFunc(self):
if self['focusOutCommand']:
- apply(self['focusOutCommand'], self['focusOutExtraArgs'])
+ self['focusOutCommand'](*self['focusOutExtraArgs'])
if self['autoCapitalize']:
self.ignore(self.guiItem.getTypeEvent())
self.ignore(self.guiItem.getEraseEvent())
@@ -263,11 +262,16 @@ class DirectEntry(DirectFrame):
does not change the current cursor position. Also see
enterText(). """
- self.unicodeText = isinstance(text, types.UnicodeType)
- if self.unicodeText:
+ if sys.version_info >= (3, 0):
+ assert not isinstance(text, bytes)
+ self.unicodeText = True
self.guiItem.setWtext(text)
else:
- self.guiItem.setText(text)
+ self.unicodeText = isinstance(text, unicode)
+ if self.unicodeText:
+ self.guiItem.setWtext(text)
+ else:
+ self.guiItem.setText(text)
def get(self, plain = False):
""" Returns the text currently showing in the typable region.
diff --git a/direct/src/gui/DirectEntryScroll.py b/direct/src/gui/DirectEntryScroll.py
index 3fe1599b1b..0cd7c3ea21 100644
--- a/direct/src/gui/DirectEntryScroll.py
+++ b/direct/src/gui/DirectEntryScroll.py
@@ -1,10 +1,10 @@
__all__ = ['DirectEntryScroll']
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectScrolledFrame import *
-from DirectFrame import *
-from DirectEntry import *
+from . import DirectGuiGlobals as DGG
+from .DirectScrolledFrame import *
+from .DirectFrame import *
+from .DirectEntry import *
class DirectEntryScroll(DirectFrame):
def __init__(self, entry, parent = None, **kw):
diff --git a/direct/src/gui/DirectFrame.py b/direct/src/gui/DirectFrame.py
index 2f5ed61241..9db60f727b 100644
--- a/direct/src/gui/DirectFrame.py
+++ b/direct/src/gui/DirectFrame.py
@@ -3,11 +3,17 @@
__all__ = ['DirectFrame']
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectGuiBase import *
-from OnscreenImage import OnscreenImage
-from OnscreenGeom import OnscreenGeom
-import types
+from . import DirectGuiGlobals as DGG
+from .DirectGuiBase import *
+from .OnscreenImage import OnscreenImage
+from .OnscreenGeom import OnscreenGeom
+import sys
+
+if sys.version_info >= (3, 0):
+ stringTypes = (str,)
+else:
+ stringTypes = (str, unicode)
+
class DirectFrame(DirectGuiWidget):
DefDynGroups = ('text', 'geom', 'image')
@@ -54,7 +60,7 @@ class DirectFrame(DirectGuiWidget):
# Determine if user passed in single string or a sequence
if self['text'] == None:
textList = (None,) * self['numStates']
- elif isinstance(self['text'], types.StringTypes):
+ elif isinstance(self['text'], stringTypes):
# If just passing in a single string, make a tuple out of it
textList = (self['text'],) * self['numStates']
else:
@@ -80,7 +86,7 @@ class DirectFrame(DirectGuiWidget):
if text == None:
return
else:
- from OnscreenText import OnscreenText
+ from .OnscreenText import OnscreenText
self.createcomponent(
component, (), 'text',
OnscreenText,
@@ -97,7 +103,7 @@ class DirectFrame(DirectGuiWidget):
# Passed in None
geomList = (None,) * self['numStates']
elif isinstance(geom, NodePath) or \
- isinstance(geom, types.StringTypes):
+ isinstance(geom, stringTypes):
# Passed in a single node path, make a tuple out of it
geomList = (geom,) * self['numStates']
else:
@@ -139,14 +145,14 @@ class DirectFrame(DirectGuiWidget):
imageList = (None,) * self['numStates']
elif isinstance(arg, NodePath) or \
isinstance(arg, Texture) or \
- isinstance(arg, types.StringTypes):
+ isinstance(arg, stringTypes):
# Passed in a single node path, make a tuple out of it
imageList = (arg,) * self['numStates']
else:
# Otherwise, hope that the user has passed in a tuple/list
if ((len(arg) == 2) and
- isinstance(arg[0], types.StringTypes) and
- isinstance(arg[1], types.StringTypes)):
+ isinstance(arg[0], stringTypes) and
+ isinstance(arg[1], stringTypes)):
# Its a model/node pair of strings
imageList = (arg,) * self['numStates']
else:
diff --git a/direct/src/gui/DirectGui.py b/direct/src/gui/DirectGui.py
index 1d3c0636de..e0a59abb82 100644
--- a/direct/src/gui/DirectGui.py
+++ b/direct/src/gui/DirectGui.py
@@ -1,9 +1,9 @@
-"""Undocumented Module"""
+""" Imports all of the DirectGUI classes. """
-import DirectGuiGlobals as DGG
-from OnscreenText import *
-from OnscreenGeom import *
-from OnscreenImage import *
+from . import DirectGuiGlobals as DGG
+from .OnscreenText import *
+from .OnscreenGeom import *
+from .OnscreenImage import *
# MPG DirectStart should call this?
# Set up default font
@@ -12,17 +12,17 @@ from OnscreenImage import *
# PGItem.getTextNode().setFont(defaultFont)
# Direct Gui Classes
-from DirectFrame import *
-from DirectButton import *
-from DirectEntry import *
-from DirectEntryScroll import *
-from DirectLabel import *
-from DirectScrolledList import *
-from DirectDialog import *
-from DirectWaitBar import *
-from DirectSlider import *
-from DirectScrollBar import *
-from DirectScrolledFrame import *
-from DirectCheckButton import *
-from DirectOptionMenu import *
-from DirectRadioButton import *
+from .DirectFrame import *
+from .DirectButton import *
+from .DirectEntry import *
+from .DirectEntryScroll import *
+from .DirectLabel import *
+from .DirectScrolledList import *
+from .DirectDialog import *
+from .DirectWaitBar import *
+from .DirectSlider import *
+from .DirectScrollBar import *
+from .DirectScrolledFrame import *
+from .DirectCheckButton import *
+from .DirectOptionMenu import *
+from .DirectRadioButton import *
diff --git a/direct/src/gui/DirectGuiBase.py b/direct/src/gui/DirectGuiBase.py
index 2c67136535..633b9615c0 100644
--- a/direct/src/gui/DirectGuiBase.py
+++ b/direct/src/gui/DirectGuiBase.py
@@ -5,14 +5,13 @@ __all__ = ['DirectGuiBase', 'DirectGuiWidget']
from panda3d.core import *
from panda3d.direct import get_config_showbase
-import DirectGuiGlobals as DGG
-from OnscreenText import *
-from OnscreenGeom import *
-from OnscreenImage import *
+from . import DirectGuiGlobals as DGG
+from .OnscreenText import *
+from .OnscreenGeom import *
+from .OnscreenImage import *
from direct.directtools.DirectUtil import ROUND_TO
from direct.showbase import DirectObject
from direct.task import Task
-import types
guiObjectCollector = PStatCollector("Client::GuiObjects")
@@ -243,7 +242,7 @@ class DirectGuiBase(DirectObject.DirectObject):
# Now check if anything is left over
unusedOptions = []
keywords = self._constructorKeywords
- for name in keywords.keys():
+ for name in keywords:
used = keywords[name][1]
if not used:
# This keyword argument has not been used. If it
@@ -350,8 +349,8 @@ class DirectGuiBase(DirectObject.DirectObject):
# This is one of the options of this gui item.
# Check it is an initialisation option.
if optionInfo[option][FUNCTION] is DGG.INITOPT:
- print 'Cannot configure initialisation option "' \
- + option + '" for ' + self.__class__.__name__
+ print('Cannot configure initialisation option "' \
+ + option + '" for ' + self.__class__.__name__)
break
#raise KeyError, \
# 'Cannot configure initialisation option "' \
@@ -506,7 +505,7 @@ class DirectGuiBase(DirectObject.DirectObject):
# with corresponding keys beginning with *component*.
alias = alias + '_'
aliasLen = len(alias)
- for option in keywords.keys():
+ for option in keywords:
if len(option) > aliasLen and option[:aliasLen] == alias:
newkey = component + '_' + option[aliasLen:]
keywords[newkey] = keywords[option]
@@ -519,7 +518,7 @@ class DirectGuiBase(DirectObject.DirectObject):
# First, walk through the option list looking for arguments
# than refer to this component's group.
- for option in keywords.keys():
+ for option in keywords:
# Check if this keyword argument refers to the group
# of this component. If so, add this to the options
# to use when constructing the widget. Mark the
@@ -538,7 +537,7 @@ class DirectGuiBase(DirectObject.DirectObject):
# specific than the group arguments, above; we walk through
# the list afterwards so they will override.
- for option in keywords.keys():
+ for option in keywords:
if len(option) > nameLen and option[:nameLen] == componentPrefix:
# The keyword argument refers to this component, so add
# this to the options to use when constructing the widget.
@@ -550,7 +549,7 @@ class DirectGuiBase(DirectObject.DirectObject):
if widgetClass is None:
return None
# Get arguments for widget constructor
- if len(widgetArgs) == 1 and type(widgetArgs[0]) == types.TupleType:
+ if len(widgetArgs) == 1 and type(widgetArgs[0]) == tuple:
# Arguments to the constructor can be specified as either
# multiple trailing arguments to createcomponent() or as a
# single tuple argument.
@@ -600,7 +599,7 @@ class DirectGuiBase(DirectObject.DirectObject):
def components(self):
# Return a list of all components.
- names = self.__componentInfo.keys()
+ names = list(self.__componentInfo.keys())
names.sort()
return names
@@ -631,8 +630,8 @@ class DirectGuiBase(DirectObject.DirectObject):
gEvent = event + self.guiId
if get_config_showbase().GetBool('debug-directgui-msgs', False):
from direct.showbase.PythonUtil import StackTrace
- print gEvent
- print StackTrace()
+ print(gEvent)
+ print(StackTrace())
self.accept(gEvent, command, extraArgs = extraArgs)
def unbind(self, event):
@@ -944,7 +943,7 @@ class DirectGuiWidget(DirectGuiBase, NodePath):
# Convert None, and string arguments
if relief == None:
relief = PGFrameStyle.TNone
- elif isinstance(relief, types.StringTypes):
+ elif isinstance(relief, str):
# Convert string to frame style int
relief = DGG.FrameStyleDict[relief]
# Set style
@@ -969,8 +968,8 @@ class DirectGuiWidget(DirectGuiBase, NodePath):
def setFrameColor(self):
# this might be a single color or a list of colors
colors = self['frameColor']
- if type(colors[0]) == types.IntType or \
- type(colors[0]) == types.FloatType:
+ if type(colors[0]) == int or \
+ type(colors[0]) == float:
colors = (colors,)
for i in range(self['numStates']):
if i >= len(colors):
@@ -985,14 +984,14 @@ class DirectGuiWidget(DirectGuiBase, NodePath):
textures = self['frameTexture']
if textures == None or \
isinstance(textures, Texture) or \
- isinstance(textures, types.StringTypes):
+ isinstance(textures, str):
textures = (textures,) * self['numStates']
for i in range(self['numStates']):
if i >= len(textures):
texture = textures[-1]
else:
texture = textures[i]
- if isinstance(texture, types.StringTypes):
+ if isinstance(texture, str):
texture = loader.loadTexture(texture)
if texture:
self.frameStyle[i].setTexture(texture)
@@ -1057,9 +1056,9 @@ class DirectGuiWidget(DirectGuiBase, NodePath):
def printConfig(self, indent = 0):
space = ' ' * indent
- print space + self.guiId, '-', self.__class__.__name__
- print space + 'Pos: %s' % tuple(self.getPos())
- print space + 'Scale: %s' % tuple(self.getScale())
+ print('%s%s - %s' % (space, self.guiId, self.__class__.__name__))
+ print('%sPos: %s' % (space, tuple(self.getPos())))
+ print('%sScale: %s' % (space, tuple(self.getScale())))
# Print out children info
for child in self.getChildren():
messenger.send(DGG.PRINT + child.getName(), [indent + 2])
diff --git a/direct/src/gui/DirectGuiTest.py b/direct/src/gui/DirectGuiTest.py
index 6172aef04d..c68c705b0e 100644
--- a/direct/src/gui/DirectGuiTest.py
+++ b/direct/src/gui/DirectGuiTest.py
@@ -5,8 +5,8 @@ __all__ = []
if __name__ == "__main__":
from direct.showbase.ShowBase import ShowBase
- import DirectGuiGlobals
- from DirectGui import *
+ from . import DirectGuiGlobals
+ from .DirectGui import *
#from whrandom import *
from random import *
@@ -18,7 +18,7 @@ if __name__ == "__main__":
# Here we specify the button's command
def dummyCmd(index):
- print 'Button %d POW!!!!' % index
+ print('Button %d POW!!!!' % index)
# Define some commands to bind to enter, exit and click events
def shrink(db):
@@ -94,7 +94,7 @@ if __name__ == "__main__":
# DIRECT ENTRY EXAMPLE
def printEntryText(text):
- print 'Text:', text
+ print('Text: %s' % (text))
# Here we create an entry, and specify everything up front
# CALL de1.get() and de1.set('new text') to get and set entry contents
@@ -110,7 +110,7 @@ if __name__ == "__main__":
# DIRECT DIALOG EXAMPLE
def printDialogValue(value):
- print 'Value:', value
+ print('Value: %s' % (value))
simpleDialog = YesNoDialog(text = 'Simple',
command = printDialogValue)
@@ -136,9 +136,9 @@ if __name__ == "__main__":
# NOTE: There are some utility functions which help you get size
# of a direct gui widget. These can be used to position and scale an
# image after you've created the entry. scale = (width/2, 1, height/2)
- print 'BOUNDS:', de1.getBounds()
- print 'WIDTH:', de1.getWidth()
- print 'HEIGHT:', de1.getHeight()
- print 'CENTER:', de1.getCenter()
+ print('BOUNDS: %s' % de1.getBounds())
+ print('WIDTH: %s' % de1.getWidth())
+ print('HEIGHT: %s' % de1.getHeight())
+ print('CENTER: %s' % (de1.getCenter(),))
base.run()
diff --git a/direct/src/gui/DirectLabel.py b/direct/src/gui/DirectLabel.py
index 6dd31c6096..5cb2932900 100644
--- a/direct/src/gui/DirectLabel.py
+++ b/direct/src/gui/DirectLabel.py
@@ -3,7 +3,7 @@
__all__ = ['DirectLabel']
from panda3d.core import *
-from DirectFrame import *
+from .DirectFrame import *
class DirectLabel(DirectFrame):
"""
diff --git a/direct/src/gui/DirectOptionMenu.py b/direct/src/gui/DirectOptionMenu.py
index 7dfc758fee..e2432a5512 100644
--- a/direct/src/gui/DirectOptionMenu.py
+++ b/direct/src/gui/DirectOptionMenu.py
@@ -2,13 +2,11 @@
__all__ = ['DirectOptionMenu']
-import types
-
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectButton import *
-from DirectLabel import *
-from DirectFrame import *
+from . import DirectGuiGlobals as DGG
+from .DirectButton import *
+from .DirectLabel import *
+from .DirectFrame import *
class DirectOptionMenu(DirectButton):
"""
@@ -252,7 +250,7 @@ class DirectOptionMenu(DirectButton):
def index(self, index):
intIndex = None
- if isinstance(index, types.IntType):
+ if isinstance(index, int):
intIndex = index
elif index in self['items']:
i = 0
@@ -272,7 +270,7 @@ class DirectOptionMenu(DirectButton):
self['text'] = item
if fCommand and self['command']:
# Pass any extra args to command
- apply(self['command'], [item] + self['extraArgs'])
+ self['command'](*[item] + self['extraArgs'])
def get(self):
""" Get currently selected item """
diff --git a/direct/src/gui/DirectRadioButton.py b/direct/src/gui/DirectRadioButton.py
index 2b0f0473e4..8044e81295 100755
--- a/direct/src/gui/DirectRadioButton.py
+++ b/direct/src/gui/DirectRadioButton.py
@@ -3,9 +3,9 @@
__all__ = ['DirectRadioButton']
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectButton import *
-from DirectLabel import *
+from . import DirectGuiGlobals as DGG
+from .DirectButton import *
+from .DirectLabel import *
class DirectRadioButton(DirectButton):
"""
@@ -205,7 +205,7 @@ class DirectRadioButton(DirectButton):
if self['command']:
# Pass any extra args to command
- apply(self['command'], self['extraArgs'])
+ self['command'](*self['extraArgs'])
def setOthers(self, others):
self['others'] = others
diff --git a/direct/src/gui/DirectScrollBar.py b/direct/src/gui/DirectScrollBar.py
index acdc0a9c95..8493547e0d 100644
--- a/direct/src/gui/DirectScrollBar.py
+++ b/direct/src/gui/DirectScrollBar.py
@@ -3,9 +3,9 @@
__all__ = ['DirectScrollBar']
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectFrame import *
-from DirectButton import *
+from . import DirectGuiGlobals as DGG
+from .DirectFrame import *
+from .DirectButton import *
"""
import DirectScrollBar
@@ -164,5 +164,5 @@ class DirectScrollBar(DirectFrame):
self._optionInfo['value'][DGG._OPT_VALUE] = self.guiItem.getValue()
if self['command']:
- apply(self['command'], self['extraArgs'])
+ self['command'](*self['extraArgs'])
diff --git a/direct/src/gui/DirectScrolledFrame.py b/direct/src/gui/DirectScrolledFrame.py
index 325582ef52..6a7be7cabf 100644
--- a/direct/src/gui/DirectScrolledFrame.py
+++ b/direct/src/gui/DirectScrolledFrame.py
@@ -3,9 +3,9 @@
__all__ = ['DirectScrolledFrame']
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectFrame import *
-from DirectScrollBar import *
+from . import DirectGuiGlobals as DGG
+from .DirectFrame import *
+from .DirectScrollBar import *
"""
import DirectScrolledFrame
@@ -87,7 +87,7 @@ class DirectScrolledFrame(DirectFrame):
def commandFunc(self):
if self['command']:
- apply(self['command'], self['extraArgs'])
+ self['command'](*self['extraArgs'])
def destroy(self):
# Destroy children of the canvas
diff --git a/direct/src/gui/DirectScrolledList.py b/direct/src/gui/DirectScrolledList.py
index 3bd5c9fd07..79c1661f7e 100644
--- a/direct/src/gui/DirectScrolledList.py
+++ b/direct/src/gui/DirectScrolledList.py
@@ -3,11 +3,11 @@
__all__ = ['DirectScrolledListItem', 'DirectScrolledList']
from panda3d.core import *
-import DirectGuiGlobals as DGG
+from . import DirectGuiGlobals as DGG
from direct.directnotify import DirectNotifyGlobal
from direct.task.Task import Task
-from DirectFrame import *
-from DirectButton import *
+from .DirectFrame import *
+from .DirectButton import *
import types
@@ -39,7 +39,7 @@ class DirectScrolledListItem(DirectButton):
def select(self):
assert self.notify.debugStateCall(self)
- apply(self.nextCommand, self.nextCommandExtraArgs)
+ self.nextCommand(*self.nextCommandExtraArgs)
self.parent.selectListItem(self)
@@ -251,7 +251,7 @@ class DirectScrolledList(DirectFrame):
if item.__class__.__name__ == 'str':
if self['itemMakeFunction']:
# If there is a function to create the item
- item = apply(self['itemMakeFunction'], (item, i, self['itemMakeExtraArgs']))
+ item = self['itemMakeFunction'](item, i, self['itemMakeExtraArgs'])
else:
item = DirectFrame(text = item,
text_align = self['itemsAlign'],
@@ -269,7 +269,7 @@ class DirectScrolledList(DirectFrame):
if self['command']:
# Pass any extra args to command
- apply(self['command'], self['extraArgs'])
+ self['command'](*self['extraArgs'])
return ret
def makeAllItems(self):
@@ -283,8 +283,7 @@ class DirectScrolledList(DirectFrame):
if item.__class__.__name__ == 'str':
if self['itemMakeFunction']:
# If there is a function to create the item
- item = apply(self['itemMakeFunction'],
- (item, i, self['itemMakeExtraArgs']))
+ item = self['itemMakeFunction'](item, i, self['itemMakeExtraArgs'])
else:
item = DirectFrame(text = item,
text_align = self['itemsAlign'],
diff --git a/direct/src/gui/DirectSlider.py b/direct/src/gui/DirectSlider.py
index 4fdc0588c8..73f5410e49 100644
--- a/direct/src/gui/DirectSlider.py
+++ b/direct/src/gui/DirectSlider.py
@@ -3,9 +3,9 @@
__all__ = ['DirectSlider']
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectFrame import *
-from DirectButton import *
+from . import DirectGuiGlobals as DGG
+from .DirectFrame import *
+from .DirectButton import *
"""
import DirectSlider
@@ -124,4 +124,4 @@ class DirectSlider(DirectFrame):
self._optionInfo['value'][DGG._OPT_VALUE] = self.guiItem.getValue()
if self['command']:
- apply(self['command'], self['extraArgs'])
+ self['command'](*self['extraArgs'])
diff --git a/direct/src/gui/DirectWaitBar.py b/direct/src/gui/DirectWaitBar.py
index ac4509987d..149540e5d5 100644
--- a/direct/src/gui/DirectWaitBar.py
+++ b/direct/src/gui/DirectWaitBar.py
@@ -3,8 +3,8 @@
__all__ = ['DirectWaitBar']
from panda3d.core import *
-import DirectGuiGlobals as DGG
-from DirectFrame import *
+from . import DirectGuiGlobals as DGG
+from .DirectFrame import *
import types
"""
@@ -93,7 +93,7 @@ class DirectWaitBar(DirectFrame):
"""Updates the bar texture, which you can set using bar['barTexture']."""
# this must be a single texture (or a string).
texture = self['barTexture']
- if isinstance(texture, types.StringTypes):
+ if isinstance(texture, str):
texture = loader.loadTexture(texture)
if texture:
self.barStyle.setTexture(texture)
diff --git a/direct/src/gui/OnscreenGeom.py b/direct/src/gui/OnscreenGeom.py
index faf020a2d1..ac4f93a418 100644
--- a/direct/src/gui/OnscreenGeom.py
+++ b/direct/src/gui/OnscreenGeom.py
@@ -4,7 +4,7 @@ __all__ = ['OnscreenGeom']
from panda3d.core import *
from direct.showbase.DirectObject import DirectObject
-import types
+
class OnscreenGeom(DirectObject, NodePath):
def __init__(self, geom = None,
@@ -49,25 +49,25 @@ class OnscreenGeom(DirectObject, NodePath):
# Adjust pose
# Set pos
- if (isinstance(pos, types.TupleType) or
- isinstance(pos, types.ListType)):
- apply(self.setPos, pos)
+ if (isinstance(pos, tuple) or
+ isinstance(pos, list)):
+ self.setPos(*pos)
elif isinstance(pos, VBase3):
self.setPos(pos)
# Hpr
- if (isinstance(hpr, types.TupleType) or
- isinstance(hpr, types.ListType)):
- apply(self.setHpr, hpr)
+ if (isinstance(hpr, tuple) or
+ isinstance(hpr, list)):
+ self.setHpr(*hpr)
elif isinstance(hpr, VBase3):
self.setPos(hpr)
# Scale
- if (isinstance(scale, types.TupleType) or
- isinstance(scale, types.ListType)):
- apply(self.setScale, scale)
+ if (isinstance(scale, tuple) or
+ isinstance(scale, list)):
+ self.setScale(*scale)
elif isinstance(scale, VBase3):
self.setPos(scale)
- elif (isinstance(scale, types.FloatType) or
- isinstance(scale, types.IntType)):
+ elif (isinstance(scale, float) or
+ isinstance(scale, int)):
self.setScale(scale)
def setGeom(self, geom,
@@ -93,7 +93,7 @@ class OnscreenGeom(DirectObject, NodePath):
# Assign geometry
if isinstance(geom, NodePath):
self.assign(geom.copyTo(parent, sort))
- elif isinstance(geom, types.StringTypes):
+ elif isinstance(geom, str):
self.assign(loader.loadModel(geom))
self.reparentTo(parent, sort)
@@ -116,17 +116,17 @@ class OnscreenGeom(DirectObject, NodePath):
if (((setter == self.setPos) or
(setter == self.setHpr) or
(setter == self.setScale)) and
- (isinstance(value, types.TupleType) or
- isinstance(value, types.ListType))):
- apply(setter, value)
+ (isinstance(value, tuple) or
+ isinstance(value, list))):
+ setter(*value)
else:
setter(value)
except AttributeError:
- print 'OnscreenText.configure: invalid option:', option
+ print('OnscreenText.configure: invalid option: %s' % option)
# Allow index style references
def __setitem__(self, key, value):
- apply(self.configure, (), {key: value})
+ self.configure(*(), **{key: value})
def cget(self, option):
# Get current configuration setting.
diff --git a/direct/src/gui/OnscreenImage.py b/direct/src/gui/OnscreenImage.py
index 7f4579886d..a99d4bf0ff 100644
--- a/direct/src/gui/OnscreenImage.py
+++ b/direct/src/gui/OnscreenImage.py
@@ -4,7 +4,7 @@ __all__ = ['OnscreenImage']
from panda3d.core import *
from direct.showbase.DirectObject import DirectObject
-import types
+
class OnscreenImage(DirectObject, NodePath):
def __init__(self, image = None,
@@ -49,25 +49,25 @@ class OnscreenImage(DirectObject, NodePath):
# Adjust pose
# Set pos
- if (isinstance(pos, types.TupleType) or
- isinstance(pos, types.ListType)):
- apply(self.setPos, pos)
+ if (isinstance(pos, tuple) or
+ isinstance(pos, list)):
+ self.setPos(*pos)
elif isinstance(pos, VBase3):
self.setPos(pos)
# Hpr
- if (isinstance(hpr, types.TupleType) or
- isinstance(hpr, types.ListType)):
- apply(self.setHpr, hpr)
+ if (isinstance(hpr, tuple) or
+ isinstance(hpr, list)):
+ self.setHpr(*hpr)
elif isinstance(hpr, VBase3):
self.setHpr(hpr)
# Scale
- if (isinstance(scale, types.TupleType) or
- isinstance(scale, types.ListType)):
- apply(self.setScale, scale)
+ if (isinstance(scale, tuple) or
+ isinstance(scale, list)):
+ self.setScale(*scale)
elif isinstance(scale, VBase3):
self.setScale(scale)
- elif (isinstance(scale, types.FloatType) or
- isinstance(scale, types.IntType)):
+ elif (isinstance(scale, float) or
+ isinstance(scale, int)):
self.setScale(scale)
# Set color
@@ -95,7 +95,7 @@ class OnscreenImage(DirectObject, NodePath):
# Assign geometry
if isinstance(image, NodePath):
self.assign(image.copyTo(parent, sort))
- elif isinstance(image, types.StringTypes) or \
+ elif isinstance(image, str) or \
isinstance(image, Texture):
if isinstance(image, Texture):
# It's a Texture
@@ -115,9 +115,9 @@ class OnscreenImage(DirectObject, NodePath):
if node:
self.assign(node.copyTo(parent, sort))
else:
- print 'OnscreenImage: node %s not found' % image[1]
+ print('OnscreenImage: node %s not found' % image[1])
else:
- print 'OnscreenImage: model %s not found' % image[0]
+ print('OnscreenImage: model %s not found' % image[0])
if transform and not self.isEmpty():
self.setTransform(transform)
@@ -133,17 +133,17 @@ class OnscreenImage(DirectObject, NodePath):
if (((setter == self.setPos) or
(setter == self.setHpr) or
(setter == self.setScale)) and
- (isinstance(value, types.TupleType) or
- isinstance(value, types.ListType))):
- apply(setter, value)
+ (isinstance(value, tuple) or
+ isinstance(value, list))):
+ setter(*value)
else:
setter(value)
except AttributeError:
- print 'OnscreenImage.configure: invalid option:', option
+ print('OnscreenImage.configure: invalid option: %s' % option)
# Allow index style references
def __setitem__(self, key, value):
- apply(self.configure, (), {key: value})
+ self.configure(*(), **{key: value})
def cget(self, option):
# Get current configuration setting.
diff --git a/direct/src/gui/OnscreenText.py b/direct/src/gui/OnscreenText.py
index 9fbea1a3a6..03beac702b 100644
--- a/direct/src/gui/OnscreenText.py
+++ b/direct/src/gui/OnscreenText.py
@@ -3,9 +3,9 @@
__all__ = ['OnscreenText', 'Plain', 'ScreenTitle', 'ScreenPrompt', 'NameConfirm', 'BlackOnWhite']
from panda3d.core import *
-import DirectGuiGlobals as DGG
+from . import DirectGuiGlobals as DGG
from direct.showbase.DirectObject import DirectObject
-import types
+import sys
## These are the styles of text we might commonly see. They set the
## overall appearance of the text according to one of a number of
@@ -152,7 +152,7 @@ class OnscreenText(DirectObject, NodePath):
else:
raise ValueError
- if not isinstance(scale, types.TupleType):
+ if not isinstance(scale, tuple):
# If the scale is already a tuple, it's a 2-d (x, y) scale.
# Otherwise, it's a uniform scale--make it a tuple.
scale = (scale, scale)
@@ -263,15 +263,24 @@ class OnscreenText(DirectObject, NodePath):
self.textNode.clearText()
def setText(self, text):
- self.unicodeText = isinstance(text, types.UnicodeType)
+ if sys.version_info >= (3, 0):
+ assert not isinstance(text, bytes)
+ self.unicodeText = True
+ else:
+ self.unicodeText = isinstance(text, unicode)
+
if self.unicodeText:
self.textNode.setWtext(text)
else:
self.textNode.setText(text)
def appendText(self, text):
- if isinstance(text, types.UnicodeType):
- self.unicodeText = 1
+ if sys.version_info >= (3, 0):
+ assert not isinstance(text, bytes)
+ self.unicodeText = True
+ else:
+ self.unicodeText = isinstance(text, unicode)
+
if self.unicodeText:
self.textNode.appendWtext(text)
else:
@@ -322,7 +331,7 @@ class OnscreenText(DirectObject, NodePath):
"""
if sy == None:
- if isinstance(sx, types.TupleType):
+ if isinstance(sx, tuple):
self.__scale = sx
else:
self.__scale = (sx, sx)
@@ -413,7 +422,7 @@ class OnscreenText(DirectObject, NodePath):
def configure(self, option=None, **kw):
# These is for compatibility with DirectGui functions
if not self.mayChange:
- print 'OnscreenText.configure: mayChange == 0'
+ print('OnscreenText.configure: mayChange == 0')
return
for option, value in kw.items():
# Use option string to access setter function
@@ -424,11 +433,11 @@ class OnscreenText(DirectObject, NodePath):
else:
setter(value)
except AttributeError:
- print 'OnscreenText.configure: invalid option:', option
+ print('OnscreenText.configure: invalid option: %s' % option)
# Allow index style references
def __setitem__(self, key, value):
- apply(self.configure, (), {key: value})
+ self.configure(*(), **{key: value})
def cget(self, option):
# Get current configuration setting.
diff --git a/direct/src/interval/ActorInterval.py b/direct/src/interval/ActorInterval.py
index ae26c4cde4..5d8b557ae6 100644
--- a/direct/src/interval/ActorInterval.py
+++ b/direct/src/interval/ActorInterval.py
@@ -5,7 +5,7 @@ __all__ = ['ActorInterval', 'LerpAnimInterval']
from panda3d.core import *
from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import *
-import Interval
+from . import Interval
import math
class ActorInterval(Interval.Interval):
diff --git a/direct/src/interval/AnimControlInterval.py b/direct/src/interval/AnimControlInterval.py
index 57494b145b..4223e69f08 100755
--- a/direct/src/interval/AnimControlInterval.py
+++ b/direct/src/interval/AnimControlInterval.py
@@ -5,7 +5,7 @@ __all__ = ['AnimControlInterval']
from panda3d.core import *
from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import *
-import Interval
+from . import Interval
import math
class AnimControlInterval(Interval.Interval):
diff --git a/direct/src/interval/FunctionInterval.py b/direct/src/interval/FunctionInterval.py
index a730373916..8f84ca9df8 100644
--- a/direct/src/interval/FunctionInterval.py
+++ b/direct/src/interval/FunctionInterval.py
@@ -6,7 +6,7 @@ from panda3d.core import *
from panda3d.direct import *
from direct.showbase.MessengerGlobal import *
from direct.directnotify.DirectNotifyGlobal import directNotify
-import Interval
+from . import Interval
#############################################################
diff --git a/direct/src/interval/IndirectInterval.py b/direct/src/interval/IndirectInterval.py
index 991265273e..a0adf30a82 100644
--- a/direct/src/interval/IndirectInterval.py
+++ b/direct/src/interval/IndirectInterval.py
@@ -5,8 +5,8 @@ __all__ = ['IndirectInterval']
from panda3d.core import *
from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import *
-import Interval
-import LerpBlendHelpers
+from . import Interval
+from . import LerpBlendHelpers
class IndirectInterval(Interval.Interval):
"""
diff --git a/direct/src/interval/Interval.py b/direct/src/interval/Interval.py
index 75eb336694..21a79f016a 100644
--- a/direct/src/interval/Interval.py
+++ b/direct/src/interval/Interval.py
@@ -452,14 +452,17 @@ class Interval(DirectObject):
"""
# Don't use a regular import, to prevent ModuleFinder from picking
# it up as a dependency when building a .p3d package.
- import importlib
+ import importlib, sys
EntryScale = importlib.import_module('direct.tkwidgets.EntryScale')
- Tkinter = importlib.import_module('Tkinter')
+ if sys.version_info >= (3, 0):
+ tkinter = importlib.import_module('tkinter')
+ else:
+ tkinter = importlib.import_module('Tkinter')
if tl == None:
- tl = Tkinter.Toplevel()
+ tl = tkinter.Toplevel()
tl.title('Interval Controls')
- outerFrame = Tkinter.Frame(tl)
+ outerFrame = tkinter.Frame(tl)
def entryScaleCommand(t, s=self):
s.setT(t)
s.pause()
@@ -468,8 +471,8 @@ class Interval(DirectObject):
min = 0, max = math.floor(self.getDuration() * 100) / 100,
command = entryScaleCommand)
es.set(self.getT(), fCommand = 0)
- es.pack(expand = 1, fill = Tkinter.X)
- bf = Tkinter.Frame(outerFrame)
+ es.pack(expand = 1, fill = tkinter.X)
+ bf = tkinter.Frame(outerFrame)
# Jump to start and end
def toStart(s=self, es=es):
s.clearToInitial()
@@ -479,23 +482,23 @@ class Interval(DirectObject):
s.setT(s.getDuration())
es.set(s.getDuration(), fCommand = 0)
s.pause()
- jumpToStart = Tkinter.Button(bf, text = '<<', command = toStart)
+ jumpToStart = tkinter.Button(bf, text = '<<', command = toStart)
# Stop/play buttons
def doPlay(s=self, es=es):
s.resume(es.get())
- stop = Tkinter.Button(bf, text = 'Stop',
+ stop = tkinter.Button(bf, text = 'Stop',
command = lambda s=self: s.pause())
- play = Tkinter.Button(
+ play = tkinter.Button(
bf, text = 'Play',
command = doPlay)
- jumpToEnd = Tkinter.Button(bf, text = '>>', command = toEnd)
- jumpToStart.pack(side = Tkinter.LEFT, expand = 1, fill = Tkinter.X)
- play.pack(side = Tkinter.LEFT, expand = 1, fill = Tkinter.X)
- stop.pack(side = Tkinter.LEFT, expand = 1, fill = Tkinter.X)
- jumpToEnd.pack(side = Tkinter.LEFT, expand = 1, fill = Tkinter.X)
- bf.pack(expand = 1, fill = Tkinter.X)
- outerFrame.pack(expand = 1, fill = Tkinter.X)
+ jumpToEnd = tkinter.Button(bf, text = '>>', command = toEnd)
+ jumpToStart.pack(side = tkinter.LEFT, expand = 1, fill = tkinter.X)
+ play.pack(side = tkinter.LEFT, expand = 1, fill = tkinter.X)
+ stop.pack(side = tkinter.LEFT, expand = 1, fill = tkinter.X)
+ jumpToEnd.pack(side = tkinter.LEFT, expand = 1, fill = tkinter.X)
+ bf.pack(expand = 1, fill = tkinter.X)
+ outerFrame.pack(expand = 1, fill = tkinter.X)
# Add function to update slider during setT calls
def update(t, es=es):
es.set(t, fCommand = 0)
diff --git a/direct/src/interval/IntervalGlobal.py b/direct/src/interval/IntervalGlobal.py
index d1589d268d..903f92d14f 100644
--- a/direct/src/interval/IntervalGlobal.py
+++ b/direct/src/interval/IntervalGlobal.py
@@ -4,23 +4,23 @@
# since the purpose of this module is to add up the contributions
# of a number of other modules.
-from Interval import *
-from ActorInterval import *
-from FunctionInterval import *
-from LerpInterval import *
-from IndirectInterval import *
-from MopathInterval import *
+from .Interval import *
+from .ActorInterval import *
+from .FunctionInterval import *
+from .LerpInterval import *
+from .IndirectInterval import *
+from .MopathInterval import *
try:
import panda3d.physics
##Some people may have the particle system compiled out
if hasattr( panda3d.physics, 'ParticleSystem' ):
- from ParticleInterval import *
+ from .ParticleInterval import *
if __debug__:
- from TestInterval import *
+ from .TestInterval import *
except ImportError:
pass
-from SoundInterval import *
-from ProjectileInterval import *
-from MetaInterval import *
-from IntervalManager import *
+from .SoundInterval import *
+from .ProjectileInterval import *
+from .MetaInterval import *
+from .IntervalManager import *
from panda3d.direct import WaitInterval
diff --git a/direct/src/interval/IntervalTest.py b/direct/src/interval/IntervalTest.py
index 4bbfc9db57..fce7e0f755 100644
--- a/direct/src/interval/IntervalTest.py
+++ b/direct/src/interval/IntervalTest.py
@@ -6,7 +6,7 @@ __all__ = []
if __name__ == "__main__":
from direct.showbase.ShowBase import ShowBase
from panda3d.core import *
- from IntervalGlobal import *
+ from .IntervalGlobal import *
from direct.actor.Actor import *
from direct.directutil import Mopath
@@ -72,7 +72,7 @@ if __name__ == "__main__":
waterEventTrack.setIntervalStartTime('water-is-done', eventTime)
def handleWaterDone():
- print 'water is done'
+ print('water is done')
# Interval can handle its own event
messenger.accept('water-is-done', waterDone, handleWaterDone)
@@ -92,7 +92,7 @@ if __name__ == "__main__":
i2 = FunctionInterval(lambda: base.transitions.fadeIn())
def caughtIt():
- print 'Caught here-is-an-event'
+ print('Caught here-is-an-event')
class DummyAcceptor(DirectObject):
pass
@@ -106,7 +106,7 @@ if __name__ == "__main__":
# Using a function
def printDone():
- print 'done'
+ print('done')
i6 = FunctionInterval(printDone)
@@ -139,25 +139,25 @@ if __name__ == "__main__":
def printStart():
global startTime
startTime = globalClock.getFrameTime()
- print 'Start'
+ print('Start')
def printPreviousStart():
global startTime
currTime = globalClock.getFrameTime()
- print 'PREVIOUS_END %0.2f' % (currTime - startTime)
+ print('PREVIOUS_END %0.2f' % (currTime - startTime))
def printPreviousEnd():
global startTime
currTime = globalClock.getFrameTime()
- print 'PREVIOUS_END %0.2f' % (currTime - startTime)
+ print('PREVIOUS_END %0.2f' % (currTime - startTime))
def printTrackStart():
global startTime
currTime = globalClock.getFrameTime()
- print 'TRACK_START %0.2f' % (currTime - startTime)
+ print('TRACK_START %0.2f' % (currTime - startTime))
def printArguments(a, b, c):
- print 'My args were %d, %d, %d' % (a, b, c)
+ print('My args were %d, %d, %d' % (a, b, c))
i1 = FunctionInterval(printStart)
# Just to take time
diff --git a/direct/src/interval/LerpInterval.py b/direct/src/interval/LerpInterval.py
index 06271fc061..24435ae084 100644
--- a/direct/src/interval/LerpInterval.py
+++ b/direct/src/interval/LerpInterval.py
@@ -15,8 +15,8 @@ __all__ = [
from panda3d.core import *
from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import *
-import Interval
-import LerpBlendHelpers
+from . import Interval
+from . import LerpBlendHelpers
#
# Most of the intervals defined in this module--the group up here at
@@ -774,17 +774,17 @@ class LerpFunctionNoStateInterval(Interval.Interval):
if (t >= self.duration):
# Set to end value
if (t > self.duration):
- print "after end"
+ print("after end")
#apply(self.function, [self.toData] + self.extraArgs)
elif self.duration == 0.0:
# Zero duration, just use endpoint
- apply(self.function, [self.toData] + self.extraArgs)
+ self.function(*[self.toData] + self.extraArgs)
else:
# In the middle of the lerp, compute appropriate blended value
bt = self.blendType(t/self.duration)
data = (self.fromData * (1 - bt)) + (self.toData * bt)
# Evaluate function
- apply(self.function, [data] + self.extraArgs)
+ self.function(*[data] + self.extraArgs)
# Print debug information
# assert self.notify.debug('updateFunc() - %s: t = %f' % (self.name, t))
@@ -841,16 +841,16 @@ class LerpFunctionInterval(Interval.Interval):
#print "doing priv step",t
if (t >= self.duration):
# Set to end value
- apply(self.function, [self.toData] + self.extraArgs)
+ self.function(*[self.toData] + self.extraArgs)
elif self.duration == 0.0:
# Zero duration, just use endpoint
- apply(self.function, [self.toData] + self.extraArgs)
+ self.function(*[self.toData] + self.extraArgs)
else:
# In the middle of the lerp, compute appropriate blended value
bt = self.blendType(t/self.duration)
data = (self.fromData * (1 - bt)) + (self.toData * bt)
# Evaluate function
- apply(self.function, [data] + self.extraArgs)
+ self.function(*[data] + self.extraArgs)
# Print debug information
# assert self.notify.debug('updateFunc() - %s: t = %f' % (self.name, t))
diff --git a/direct/src/interval/MetaInterval.py b/direct/src/interval/MetaInterval.py
index 7ec7967662..d7b23afdeb 100644
--- a/direct/src/interval/MetaInterval.py
+++ b/direct/src/interval/MetaInterval.py
@@ -5,10 +5,9 @@ __all__ = ['MetaInterval', 'Sequence', 'Parallel', 'ParallelEndTogether', 'Track
from panda3d.core import *
from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import *
-from IntervalManager import ivalMgr
-import Interval
+from .IntervalManager import ivalMgr
+from . import Interval
from direct.task.Task import TaskManager
-import types
#if __debug__:
# import direct.showbase.PythonUtil as PythonUtil
@@ -32,7 +31,7 @@ class MetaInterval(CMetaInterval):
# "create interval", 1, 10)
name = None
- #if len(ivals) == 2 and isinstance(ivals[1], types.StringType):
+ #if len(ivals) == 2 and isinstance(ivals[1], str):
# # If the second parameter is a string, it's the name.
# name = ivals[1]
# ivals = ivals[0]
@@ -69,7 +68,7 @@ class MetaInterval(CMetaInterval):
del kw['duration']
if kw:
- self.notify.error("Unexpected keyword parameters: %s" % (kw.keys()))
+ self.notify.error("Unexpected keyword parameters: %s" % (list(kw.keys())))
# We must allow the old style: Track([ival0, ival1, ...]) as
# well as the new style: Track(ival0, ival1, ...)
@@ -80,8 +79,8 @@ class MetaInterval(CMetaInterval):
# bug, since it will go away when we eventually remove support
# for the old interface.
#if len(ivals) == 1 and \
- # (isinstance(ivals[0], types.TupleType) or \
- # isinstance(ivals[0], types.ListType)):
+ # (isinstance(ivals[0], tuple) or \
+ # isinstance(ivals[0], list)):
# self.ivals = ivals[0]
#else:
@@ -121,7 +120,7 @@ class MetaInterval(CMetaInterval):
def append(self, ival):
# Appends a single interval to the list so far.
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
self.ivals.append(ival)
self.__ivalsDirty = 1
@@ -141,7 +140,7 @@ class MetaInterval(CMetaInterval):
def insert(self, index, ival):
# Inserts the given interval into the middle of the list.
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
self.ivals.insert(index, ival)
self.__ivalsDirty = 1
@@ -150,7 +149,7 @@ class MetaInterval(CMetaInterval):
def pop(self, index = None):
# Returns element index (or the last element) and removes it
# from the list.
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
self.__ivalsDirty = 1
if index == None:
@@ -160,21 +159,21 @@ class MetaInterval(CMetaInterval):
def remove(self, ival):
# Removes the indicated interval from the list.
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
self.ivals.remove(ival)
self.__ivalsDirty = 1
def reverse(self):
# Reverses the order of the intervals.
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
self.ivals.reverse()
self.__ivalsDirty = 1
def sort(self, cmpfunc = None):
# Sorts the intervals. (?)
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
self.__ivalsDirty = 1
if cmpfunc == None:
@@ -189,38 +188,38 @@ class MetaInterval(CMetaInterval):
return self.ivals[index]
def __setitem__(self, index, value):
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
self.ivals[index] = value
self.__ivalsDirty = 1
assert self.validateComponent(value)
def __delitem__(self, index):
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
del self.ivals[index]
self.__ivalsDirty = 1
def __getslice__(self, i, j):
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
return self.__class__(self.ivals[i: j])
def __setslice__(self, i, j, s):
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
self.ivals[i: j] = s
self.__ivalsDirty = 1
assert self.validateComponents(s)
def __delslice__(self, i, j):
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
del self.ivals[i: j]
self.__ivalsDirty = 1
def __iadd__(self, other):
- if isinstance(self.ivals, types.TupleType):
+ if isinstance(self.ivals, tuple):
self.ivals = list(self.ivals)
if isinstance(other, MetaInterval):
assert self.__class__ == other.__class__
@@ -283,8 +282,8 @@ class MetaInterval(CMetaInterval):
# is TRACK_START.
self.pushLevel(name, relTime, relTo)
for tuple in list:
- if isinstance(tuple, types.TupleType) or \
- isinstance(tuple, types.ListType):
+ if isinstance(tuple, tuple) or \
+ isinstance(tuple, list):
relTime = tuple[0]
ival = tuple[1]
if len(tuple) >= 3:
@@ -497,10 +496,10 @@ class MetaInterval(CMetaInterval):
ival = None
except:
if ival != None:
- print "Exception occurred while processing %s of %s:" % (ival.getName(), self.getName())
+ print("Exception occurred while processing %s of %s:" % (ival.getName(), self.getName()))
else:
- print "Exception occurred while processing %s:" % (self.getName())
- print self
+ print("Exception occurred while processing %s:" % (self.getName()))
+ print(self)
raise
def privDoEvent(self, t, event):
@@ -601,8 +600,8 @@ class Track(MetaInterval):
# this is the same as asking that the component is itself an
# Interval.
- if not (isinstance(tuple, types.TupleType) or \
- isinstance(tuple, types.ListType)):
+ if not (isinstance(tuple, tuple) or \
+ isinstance(tuple, list)):
# It's not a tuple.
return 0
@@ -613,8 +612,8 @@ class Track(MetaInterval):
else:
relTo = TRACK_START
- if not (isinstance(relTime, types.FloatType) or \
- isinstance(relTime, types.IntType)):
+ if not (isinstance(relTime, float) or \
+ isinstance(relTime, int)):
# First parameter is not a number.
return 0
if not MetaInterval.validateComponent(self, ival):
diff --git a/direct/src/interval/MopathInterval.py b/direct/src/interval/MopathInterval.py
index 0764b1bc12..83ea995caa 100644
--- a/direct/src/interval/MopathInterval.py
+++ b/direct/src/interval/MopathInterval.py
@@ -2,7 +2,7 @@
__all__ = ['MopathInterval']
-import LerpInterval
+from . import LerpInterval
from panda3d.core import *
from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import *
diff --git a/direct/src/interval/ParticleInterval.py b/direct/src/interval/ParticleInterval.py
index 3682904fce..c373af7542 100644
--- a/direct/src/interval/ParticleInterval.py
+++ b/direct/src/interval/ParticleInterval.py
@@ -9,7 +9,7 @@ Contains the ParticleInterval class
from panda3d.core import *
from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import directNotify
-from Interval import Interval
+from .Interval import Interval
class ParticleInterval(Interval):
diff --git a/direct/src/interval/ProjectileInterval.py b/direct/src/interval/ProjectileInterval.py
index 9b8942d5ab..a1b5d70014 100755
--- a/direct/src/interval/ProjectileInterval.py
+++ b/direct/src/interval/ProjectileInterval.py
@@ -5,7 +5,7 @@ __all__ = ['ProjectileInterval']
from panda3d.core import *
from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import *
-from Interval import Interval
+from .Interval import Interval
from direct.showbase import PythonUtil
class ProjectileInterval(Interval):
diff --git a/direct/src/interval/ProjectileIntervalTest.py b/direct/src/interval/ProjectileIntervalTest.py
index 7e0b080d5a..bd747be382 100755
--- a/direct/src/interval/ProjectileIntervalTest.py
+++ b/direct/src/interval/ProjectileIntervalTest.py
@@ -4,7 +4,7 @@ __all__ = ['doTest']
from panda3d.core import *
from panda3d.direct import *
-from IntervalGlobal import *
+from .IntervalGlobal import *
def doTest():
smiley = loader.loadModel('models/misc/smiley')
diff --git a/direct/src/interval/SoundInterval.py b/direct/src/interval/SoundInterval.py
index ca38af297a..5927d14703 100644
--- a/direct/src/interval/SoundInterval.py
+++ b/direct/src/interval/SoundInterval.py
@@ -5,7 +5,7 @@ __all__ = ['SoundInterval']
from panda3d.core import *
from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import *
-import Interval
+from . import Interval
import random
class SoundInterval(Interval.Interval):
diff --git a/direct/src/interval/TestInterval.py b/direct/src/interval/TestInterval.py
index 444ad20aaf..82a04b604e 100755
--- a/direct/src/interval/TestInterval.py
+++ b/direct/src/interval/TestInterval.py
@@ -9,7 +9,7 @@ Contains the ParticleInterval class
from panda3d.core import *
from panda3d.direct import *
from direct.directnotify.DirectNotifyGlobal import directNotify
-from Interval import Interval
+from .Interval import Interval
class TestInterval(Interval):
diff --git a/direct/src/leveleditor/ActionMgr.py b/direct/src/leveleditor/ActionMgr.py
index 041f6b4cf2..29d9ba3742 100755
--- a/direct/src/leveleditor/ActionMgr.py
+++ b/direct/src/leveleditor/ActionMgr.py
@@ -1,5 +1,5 @@
from pandac.PandaModules import *
-import ObjectGlobals as OG
+from . import ObjectGlobals as OG
class ActionMgr:
def __init__(self):
@@ -22,7 +22,7 @@ class ActionMgr:
def undo(self):
if len(self.undoList) < 1:
- print 'No more undo'
+ print('No more undo')
else:
action = self.undoList.pop()
self.redoList.append(action)
@@ -30,7 +30,7 @@ class ActionMgr:
def redo(self):
if len(self.redoList) < 1:
- print 'No more redo'
+ print('No more redo')
else:
action = self.redoList.pop()
self.undoList.append(action)
@@ -70,7 +70,7 @@ class ActionBase(Functor):
pass
def undo(self):
- print "undo method is not defined for this action"
+ print("undo method is not defined for this action")
class ActionAddNewObj(ActionBase):
""" Action class for adding new object """
@@ -88,16 +88,16 @@ class ActionAddNewObj(ActionBase):
def redo(self):
if self.uid is None:
- print "Can't redo this add"
+ print("Can't redo this add")
else:
self.result = self._do__call__(uid=self.uid)
return self.result
def undo(self):
if self.result is None:
- print "Can't undo this add"
+ print("Can't undo this add")
else:
- print "Undo: addNewObject"
+ print("Undo: addNewObject")
if self.uid:
obj = self.editor.objectMgr.findObjectById(self.uid)
else:
@@ -109,7 +109,7 @@ class ActionAddNewObj(ActionBase):
base.direct.removeNodePath(obj[OG.OBJ_NP])
self.result = None
else:
- print "Can't undo this add"
+ print("Can't undo this add")
class ActionDeleteObj(ActionBase):
""" Action class for deleting object """
@@ -150,11 +150,11 @@ class ActionDeleteObj(ActionBase):
saveObjStatus(np, False)
def undo(self):
- if len(self.hierarchy.keys()) == 0 or\
- len(self.objInfos.keys()) == 0:
- print "Can't undo this deletion"
+ if len(self.hierarchy) == 0 or\
+ len(self.objInfos) == 0:
+ print("Can't undo this deletion")
else:
- print "Undo: deleteObject"
+ print("Undo: deleteObject")
def restoreObject(uid, parentNP):
obj = self.objInfos[uid]
objDef = obj[OG.OBJ_DEF]
@@ -169,8 +169,8 @@ class ActionDeleteObj(ActionBase):
self.editor.objectMgr.updateObjectProperties(objNP, objProp)
objNP.setMat(self.objTransforms[uid])
- while (len(self.hierarchy.keys()) > 0):
- for uid in self.hierarchy.keys():
+ while len(self.hierarchy) > 0:
+ for uid in self.hierarchy:
if self.hierarchy[uid] is None:
parentNP = None
restoreObject(uid, parentNP)
@@ -230,11 +230,11 @@ class ActionDeleteObjById(ActionBase):
saveObjStatus(self.uid, True)
def undo(self):
- if len(self.hierarchy.keys()) == 0 or\
- len(self.objInfos.keys()) == 0:
- print "Can't undo this deletion"
+ if len(self.hierarchy) == 0 or\
+ len(self.objInfos) == 0:
+ print("Can't undo this deletion")
else:
- print "Undo: deleteObjectById"
+ print("Undo: deleteObjectById")
def restoreObject(uid, parentNP):
obj = self.objInfos[uid]
objDef = obj[OG.OBJ_DEF]
@@ -249,8 +249,8 @@ class ActionDeleteObjById(ActionBase):
self.editor.objectMgr.updateObjectProperties(objNP, objProp)
objNP.setMat(self.objTransforms[uid])
- while (len(self.hierarchy.keys()) > 0):
- for uid in self.hierarchy.keys():
+ while len(self.hierarchy) > 0:
+ for uid in self.hierarchy:
if self.hierarchy[uid] is None:
parentNP = None
restoreObject(uid, parentNP)
@@ -298,7 +298,7 @@ class ActionSelectObj(ActionBase):
self.selectedUIDs.append(uid)
def undo(self):
- print "Undo : selectObject"
+ print("Undo : selectObject")
base.direct.deselectAllCB()
for uid in self.selectedUIDs:
obj = self.editor.objectMgr.findObjectById(uid)
@@ -332,9 +332,9 @@ class ActionTransformObj(ActionBase):
def undo(self):
if self.origMat is None:
- print "Can't undo this transform"
+ print("Can't undo this transform")
else:
- print "Undo: transformObject"
+ print("Undo: transformObject")
obj = self.editor.objectMgr.findObjectById(self.uid)
if obj:
obj[OG.OBJ_NP].setMat(self.origMat)
@@ -360,7 +360,7 @@ class ActionDeselectAll(ActionBase):
self.selectedUIDs.append(uid)
def undo(self):
- print "Undo : deselectAll"
+ print("Undo : deselectAll")
base.direct.deselectAllCB()
for uid in self.selectedUIDs:
obj = self.editor.objectMgr.findObjectById(uid)
@@ -391,7 +391,7 @@ class ActionUpdateObjectProp(ActionBase):
return self.result
def undo(self):
- print "Undo : updateObjectProp"
+ print("Undo : updateObjectProp")
if self.oldVal:
self.obj[OG.OBJ_PROP][self.propName] = self.oldVal
if self.undoFunc:
diff --git a/direct/src/leveleditor/AnimControlUI.py b/direct/src/leveleditor/AnimControlUI.py
index 71cf4168cf..2137da5c35 100755
--- a/direct/src/leveleditor/AnimControlUI.py
+++ b/direct/src/leveleditor/AnimControlUI.py
@@ -3,11 +3,9 @@
"""
from direct.interval.IntervalGlobal import *
from direct.actor.Actor import *
-from panda3d.core import VBase3,VBase4
-import ObjectGlobals as OG
-import AnimGlobals as AG
+from . import ObjectGlobals as OG
-import os,wx, time
+import os, wx
from wx.lib.embeddedimage import PyEmbeddedImage
#----------------------------------------------------------------------
@@ -895,13 +893,13 @@ class AnimControlUI(wx.Dialog):
del self.keys[i]
break
- for j in self.editor.animMgr.keyFramesInfo.keys():
+ for j in list(self.editor.animMgr.keyFramesInfo.keys()):
for k in range(0,len(self.editor.animMgr.keyFramesInfo[j])):
if self.curFrame == self.editor.animMgr.keyFramesInfo[j][k][0]:
del self.editor.animMgr.keyFramesInfo[j][k]
break
- for l in self.editor.animMgr.keyFramesInfo.keys():
+ for l in list(self.editor.animMgr.keyFramesInfo.keys()):
if len(self.editor.animMgr.keyFramesInfo[l]) == 0:
del self.editor.animMgr.keyFramesInfo[l]
diff --git a/direct/src/leveleditor/AnimMgr.py b/direct/src/leveleditor/AnimMgr.py
index 6be3aa58f6..f57766f791 100755
--- a/direct/src/leveleditor/AnimMgr.py
+++ b/direct/src/leveleditor/AnimMgr.py
@@ -1,7 +1,7 @@
"""
Defines AnimMgr
"""
-from AnimMgrBase import *
+from .AnimMgrBase import *
class AnimMgr(AnimMgrBase):
""" Animation will create, manage, update animations in the scene """
diff --git a/direct/src/leveleditor/AnimMgrBase.py b/direct/src/leveleditor/AnimMgrBase.py
index ecc0a55ae3..09cf49f73c 100755
--- a/direct/src/leveleditor/AnimMgrBase.py
+++ b/direct/src/leveleditor/AnimMgrBase.py
@@ -2,12 +2,12 @@
Defines AnimMgrBase
"""
-import os, wx, math
+import os, math
from direct.interval.IntervalGlobal import *
-from panda3d.core import VBase3,VBase4
-import ObjectGlobals as OG
-import AnimGlobals as AG
+from panda3d.core import VBase3
+from . import ObjectGlobals as OG
+from . import AnimGlobals as AG
class AnimMgrBase:
""" AnimMgr will create, manage, update animations in the scene """
@@ -47,7 +47,7 @@ class AnimMgrBase:
def generateKeyFrames(self):
#generate keyFrame list
self.keyFrames = []
- for property in self.keyFramesInfo.keys():
+ for property in list(self.keyFramesInfo.keys()):
for frameInfo in self.keyFramesInfo[property]:
frame = frameInfo[AG.FRAME]
exist = False
@@ -80,7 +80,7 @@ class AnimMgrBase:
return
def removeAnimInfo(self, uid):
- for property in self.keyFramesInfo.keys():
+ for property in list(self.keyFramesInfo.keys()):
if property[AG.UID] == uid:
del self.keyFramesInfo[property]
self.generateKeyFrames()
@@ -141,7 +141,7 @@ class AnimMgrBase:
#generate key frame animation for normal property
self.editor.objectMgr.findNodes(render)
for node in self.editor.objectMgr.Nodes:
- for property in self.keyFramesInfo.keys():
+ for property in list(self.keyFramesInfo.keys()):
if property[AG.UID] == node[OG.OBJ_UID] and property[AG.PROP_NAME] != 'X' and property[AG.PROP_NAME] != 'Y' and property[AG.PROP_NAME] != 'Z':
mysequence = Sequence(name = node[OG.OBJ_UID])
keyFramesInfo = self.keyFramesInfo[property]
@@ -166,7 +166,7 @@ class AnimMgrBase:
#generate key frame animation for the property which is controled by animation curve
self.editor.objectMgr.findNodes(render)
for node in self.editor.objectMgr.Nodes:
- for property in self.keyFramesInfo.keys():
+ for property in list(self.keyFramesInfo.keys()):
if property[AG.UID] == node[OG.OBJ_UID]:
if property[AG.PROP_NAME] == 'X' or property[AG.PROP_NAME] == 'Y' or property[AG.PROP_NAME] == 'Z':
mysequence = Sequence(name = node[OG.OBJ_UID])
diff --git a/direct/src/leveleditor/CurveAnimUI.py b/direct/src/leveleditor/CurveAnimUI.py
index b779b2c615..ca99d1eca4 100755
--- a/direct/src/leveleditor/CurveAnimUI.py
+++ b/direct/src/leveleditor/CurveAnimUI.py
@@ -1,12 +1,12 @@
"""
This is the GUI for the Curve Animation
"""
-import os, wx, time
+import wx
from direct.interval.IntervalGlobal import *
from direct.actor.Actor import *
-from direct.showutil.Rope import Rope
-import ObjectGlobals as OG
+from . import ObjectGlobals as OG
+
class CurveAnimUI(wx.Dialog):
"""
@@ -129,8 +129,8 @@ class CurveAnimUI(wx.Dialog):
return
hasKey = False
- for key in self.editor.animMgr.curveAnimation.keys():
- if key == (self.nodePath[OG.OBJ_UID],self.curve[OG.OBJ_UID]):
+ for key in self.editor.animMgr.curveAnimation:
+ if key == (self.nodePath[OG.OBJ_UID], self.curve[OG.OBJ_UID]):
dlg = wx.MessageDialog(None, 'Already have the animation for this object attach to this curve.', 'NOTICE', wx.OK )
dlg.ShowModal()
dlg.Destroy()
diff --git a/direct/src/leveleditor/CurveEditor.py b/direct/src/leveleditor/CurveEditor.py
index bc1d907c22..b1acc04525 100755
--- a/direct/src/leveleditor/CurveEditor.py
+++ b/direct/src/leveleditor/CurveEditor.py
@@ -7,9 +7,9 @@ from direct.wxwidgets.WxPandaShell import *
from direct.showbase.DirectObject import *
from direct.directtools.DirectSelection import SelectionRay
from direct.showutil.Rope import Rope
-from ActionMgr import *
+from .ActionMgr import *
from direct.task import Task
-import ObjectGlobals as OG
+
class CurveEditor(DirectObject):
""" CurveEditor will create and edit the curve """
diff --git a/direct/src/leveleditor/FileMgr.py b/direct/src/leveleditor/FileMgr.py
index c1b39fda98..a0b00d1a04 100755
--- a/direct/src/leveleditor/FileMgr.py
+++ b/direct/src/leveleditor/FileMgr.py
@@ -1,11 +1,6 @@
import os
import imp
-from ObjectMgr import ObjectMgr
-from ObjectHandler import ObjectHandler
-from ObjectPalette import ObjectPalette
-from ProtoPalette import ProtoPalette
-import ObjectGlobals as OG
class FileMgr:
""" To handle data file """
@@ -40,7 +35,7 @@ class FileMgr:
self.editor.updateStatusReadout('Sucessfully saved to %s'%fileName)
self.editor.fNeedToSave = False
except IOError:
- print 'failed to save %s'%fileName
+ print('failed to save %s'%fileName)
if f:
f.close()
@@ -54,4 +49,4 @@ class FileMgr:
self.editor.updateStatusReadout('Sucessfully opened file %s'%fileName)
self.editor.fNeedToSave = False
except:
- print 'failed to load %s'%fileName
+ print('failed to load %s'%fileName)
diff --git a/direct/src/leveleditor/GraphEditorUI.py b/direct/src/leveleditor/GraphEditorUI.py
index 5e69cf6710..908fde08da 100755
--- a/direct/src/leveleditor/GraphEditorUI.py
+++ b/direct/src/leveleditor/GraphEditorUI.py
@@ -1,12 +1,11 @@
"""
Defines Graph Editor
"""
-import os,wx
+import wx
import math
-import cPickle as pickle
-from PaletteTreeCtrl import *
-import ObjectGlobals as OG
-import AnimGlobals as AG
+from .PaletteTreeCtrl import *
+from . import ObjectGlobals as OG
+from . import AnimGlobals as AG
from wx.lib.embeddedimage import PyEmbeddedImage
property = [
@@ -131,7 +130,7 @@ class GraphEditorWindow(wx.Window):
if self._mainDialog.editor.animMgr.keyFramesInfo != {}:
self.keyFramesInfo = self._mainDialog.editor.animMgr.keyFramesInfo
- for key in self.keyFramesInfo.keys():
+ for key in self.keyFramesInfo:
if key == (self.object[OG.OBJ_UID], 'X'):
for i in range(len(self.keyFramesInfo[key])):
item = self.keyFramesInfo[key][i]
diff --git a/direct/src/leveleditor/HotKeyUI.py b/direct/src/leveleditor/HotKeyUI.py
index 8c8b442824..8cde68b0eb 100755
--- a/direct/src/leveleditor/HotKeyUI.py
+++ b/direct/src/leveleditor/HotKeyUI.py
@@ -89,8 +89,8 @@ class EditHotKeyDialog(wx.Dialog):
newKeyStr = specialKey
if newKeyStr != self.currKey:
- if newKeyStr in base.direct.hotKeyMap.keys():
- print 'a hotkey is to be overridden with', newKeyStr
+ if newKeyStr in list(base.direct.hotKeyMap.keys()):
+ print('a hotkey is to be overridden with %s' % newKeyStr)
oldKeyDesc = base.direct.hotKeyMap[newKeyStr]
msg = 'The hotkey is already assigned to %s\n'%oldKeyDesc[0] +\
'Do you want to override this?'
@@ -116,7 +116,7 @@ class HotKeyPanel(ScrolledPanel):
def updateUI(self):
vbox = wx.BoxSizer(wx.VERTICAL)
- keys = base.direct.hotKeyMap.keys()
+ keys = list(base.direct.hotKeyMap.keys())
keys.sort()
for key in keys:
keyDesc = base.direct.hotKeyMap[key]
diff --git a/direct/src/leveleditor/LayerEditorUI.py b/direct/src/leveleditor/LayerEditorUI.py
index 442d85d576..d77f8779bb 100644
--- a/direct/src/leveleditor/LayerEditorUI.py
+++ b/direct/src/leveleditor/LayerEditorUI.py
@@ -2,11 +2,9 @@
Defines Layer UI
"""
import wx
-import sys
-import cPickle as pickle
from pandac.PandaModules import *
-import ObjectGlobals as OG
+from . import ObjectGlobals as OG
class LayerEditorUI(wx.Panel):
def __init__(self, parent, editor):
@@ -160,7 +158,7 @@ class LayerEditorUI(wx.Panel):
self.llist.SetItemState(index, wx.LIST_STATE_FOCUSED, wx.LIST_STATE_FOCUSED)
def removeObjData(self, objUID):
- layersDataDictKeys = self.layersDataDict.keys()
+ layersDataDictKeys = list(self.layersDataDict.keys())
for i in range(len(layersDataDictKeys)):
layersData = self.layersDataDict[layersDataDictKeys[i]]
for j in range(len(layersData)):
@@ -247,7 +245,7 @@ class LayerEditorUI(wx.Panel):
self.saveData.append(" ui.layerEditorUI.reset()")
for index in range(self.llist.GetItemCount()):
self.saveData.append(" ui.layerEditorUI.addLayerEntry('%s', %s )"%(self.llist.GetItemText(index), self.llist.GetItemData(index)))
- layersDataDictKeys = self.layersDataDict.keys()
+ layersDataDictKeys = list(self.layersDataDict.keys())
for i in range(len(layersDataDictKeys)):
layerData = self.layersDataDict[layersDataDictKeys[i]]
for j in range(len(layerData)):
diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py
index 43fd87f473..c1322c455d 100644
--- a/direct/src/leveleditor/LevelEditor.py
+++ b/direct/src/leveleditor/LevelEditor.py
@@ -5,13 +5,13 @@ LevelEditor, ObjectHandler, ObjectPalette should be rewritten
to be game specific.
"""
-from LevelEditorUI import *
-from LevelEditorBase import *
-from ObjectMgr import *
-from AnimMgr import *
-from ObjectHandler import *
-from ObjectPalette import *
-from ProtoPalette import *
+from .LevelEditorUI import *
+from .LevelEditorBase import *
+from .ObjectMgr import *
+from .AnimMgr import *
+from .ObjectHandler import *
+from .ObjectPalette import *
+from .ProtoPalette import *
class LevelEditor(LevelEditorBase):
""" Class for Panda3D LevelEditor """
diff --git a/direct/src/leveleditor/LevelEditorBase.py b/direct/src/leveleditor/LevelEditorBase.py
index 68bcea9ec8..ad351a7e39 100755
--- a/direct/src/leveleditor/LevelEditorBase.py
+++ b/direct/src/leveleditor/LevelEditorBase.py
@@ -9,10 +9,10 @@ from direct.showbase.DirectObject import *
from direct.directtools.DirectUtil import *
from direct.gui.DirectGui import *
-from CurveEditor import *
-from FileMgr import *
-from ActionMgr import *
-from MayaConverter import *
+from .CurveEditor import *
+from .FileMgr import *
+from .ActionMgr import *
+from .MayaConverter import *
class LevelEditorBase(DirectObject):
""" Base Class for Panda3D LevelEditor """
diff --git a/direct/src/leveleditor/LevelEditorStart.py b/direct/src/leveleditor/LevelEditorStart.py
index e9bccd920a..4ec577106c 100644
--- a/direct/src/leveleditor/LevelEditorStart.py
+++ b/direct/src/leveleditor/LevelEditorStart.py
@@ -1,4 +1,4 @@
-import LevelEditor
+from . import LevelEditor
if __name__ == '__main__':
base.le = LevelEditor.LevelEditor()
diff --git a/direct/src/leveleditor/LevelEditorUI.py b/direct/src/leveleditor/LevelEditorUI.py
index 574c957239..9fec2d28d8 100755
--- a/direct/src/leveleditor/LevelEditorUI.py
+++ b/direct/src/leveleditor/LevelEditorUI.py
@@ -1,4 +1,4 @@
-from LevelEditorUIBase import *
+from .LevelEditorUIBase import *
class LevelEditorUI(LevelEditorUIBase):
""" Class for Panda3D LevelEditor """
diff --git a/direct/src/leveleditor/LevelEditorUIBase.py b/direct/src/leveleditor/LevelEditorUIBase.py
index 7b46e3eb02..f457f838d6 100755
--- a/direct/src/leveleditor/LevelEditorUIBase.py
+++ b/direct/src/leveleditor/LevelEditorUIBase.py
@@ -7,16 +7,16 @@ from direct.wxwidgets.WxPandaShell import *
from direct.directtools.DirectSelection import SelectionRay
#from ViewPort import *
-from ObjectPaletteUI import *
-from ObjectPropertyUI import *
-from SceneGraphUI import *
-from LayerEditorUI import *
-from HotKeyUI import *
-from ProtoPaletteUI import *
-from ActionMgr import *
-from AnimControlUI import *
-from CurveAnimUI import *
-from GraphEditorUI import *
+from .ObjectPaletteUI import *
+from .ObjectPropertyUI import *
+from .SceneGraphUI import *
+from .LayerEditorUI import *
+from .HotKeyUI import *
+from .ProtoPaletteUI import *
+from .ActionMgr import *
+from .AnimControlUI import *
+from .CurveAnimUI import *
+from .GraphEditorUI import *
class PandaTextDropTarget(wx.TextDropTarget):
def __init__(self, editor, view):
@@ -32,7 +32,7 @@ class PandaTextDropTarget(wx.TextDropTarget):
action = ActionAddNewObj(self.editor, text, parent=parentNPRef[0])
self.editor.actionMgr.push(action)
newobj = action()
- print newobj
+ print(newobj)
if newobj is None:
return
@@ -584,12 +584,12 @@ class LevelEditorUIBase(WxPandaShell):
def replaceObject(self, evt, all=False):
currObj = self.editor.objectMgr.findObjectByNodePath(base.direct.selected.last)
if currObj is None:
- print 'No valid object is selected for replacement'
+ print('No valid object is selected for replacement')
return
targetType = self.editor.ui.objectPaletteUI.getSelected()
if targetType is None:
- print 'No valid target type is selected for replacement'
+ print('No valid target type is selected for replacement')
return
if all:
diff --git a/direct/src/leveleditor/LevelLoader.py b/direct/src/leveleditor/LevelLoader.py
index 77824aaa37..79f4a6644c 100755
--- a/direct/src/leveleditor/LevelLoader.py
+++ b/direct/src/leveleditor/LevelLoader.py
@@ -16,8 +16,8 @@ from direct.leveleditor.LevelLoaderBase import LevelLoaderBase
from direct.leveleditor.ObjectMgr import ObjectMgr
from direct.leveleditor.ProtoPalette import ProtoPalette
from direct.leveleditor import ObjectGlobals as OG
-from ObjectHandler import ObjectHandler
-from ObjectPalette import ObjectPalette
+from .ObjectHandler import ObjectHandler
+from .ObjectPalette import ObjectPalette
class LevelLoader(LevelLoaderBase):
def __init__(self):
diff --git a/direct/src/leveleditor/LevelLoaderBase.py b/direct/src/leveleditor/LevelLoaderBase.py
index c5b9c6b907..1e3489e96b 100755
--- a/direct/src/leveleditor/LevelLoaderBase.py
+++ b/direct/src/leveleditor/LevelLoaderBase.py
@@ -33,5 +33,5 @@ class LevelLoaderBase:
module = imp.load_module(fileName, file, pathname, description)
return True
except:
- print 'failed to load %s'%fileName
+ print('failed to load %s'%fileName)
return None
diff --git a/direct/src/leveleditor/MayaConverter.py b/direct/src/leveleditor/MayaConverter.py
index cf13b1259d..6c1feb4db1 100755
--- a/direct/src/leveleditor/MayaConverter.py
+++ b/direct/src/leveleditor/MayaConverter.py
@@ -1,6 +1,6 @@
from direct.wxwidgets.WxAppShell import *
-import os, re, shutil
-import ObjectGlobals as OG
+import os
+from . import ObjectGlobals as OG
CLOSE_STDIN = ""
@@ -30,7 +30,7 @@ class Process:
#some platforms (like Windows) will send some small number
#of bytes per .write() call (sometimes 2 in the case of
#Windows).
- self.b.extend([input[i:i+512] for i in xrange(0, len(input), 512)])
+ self.b.extend([input[i:i+512] for i in range(0, len(input), 512)])
input = self.b.pop(0)
self.process._stdin_.write(input)
if hasattr(self.process._stdin_, "LastWrite"):
diff --git a/direct/src/leveleditor/ObjectHandler.py b/direct/src/leveleditor/ObjectHandler.py
index e51bf2b8fb..b93fc82ddb 100755
--- a/direct/src/leveleditor/ObjectHandler.py
+++ b/direct/src/leveleditor/ObjectHandler.py
@@ -7,7 +7,7 @@ to be game specific.
from direct.actor import Actor
-import ObjectGlobals as OG
+from . import ObjectGlobals as OG
class ObjectHandler:
""" ObjectHandler will create and update objects """
diff --git a/direct/src/leveleditor/ObjectMgr.py b/direct/src/leveleditor/ObjectMgr.py
index d3219dde70..d80f8d4439 100755
--- a/direct/src/leveleditor/ObjectMgr.py
+++ b/direct/src/leveleditor/ObjectMgr.py
@@ -1,7 +1,7 @@
"""
Defines ObjectMgr
"""
-from ObjectMgrBase import *
+from .ObjectMgrBase import *
class ObjectMgr(ObjectMgrBase):
""" ObjectMgr will create, manage, update objects in the scene """
diff --git a/direct/src/leveleditor/ObjectMgrBase.py b/direct/src/leveleditor/ObjectMgrBase.py
index bb16f47e4d..3a65d6a998 100755
--- a/direct/src/leveleditor/ObjectMgrBase.py
+++ b/direct/src/leveleditor/ObjectMgrBase.py
@@ -2,14 +2,13 @@
Defines ObjectMgrBase
"""
-import os, time, wx, types, copy
+import os, time, copy
from direct.task import Task
from direct.actor.Actor import Actor
from pandac.PandaModules import *
-from ActionMgr import *
-import ObjectGlobals as OG
-from ObjectPaletteBase import ObjectGen
+from .ActionMgr import *
+from . import ObjectGlobals as OG
# python wrapper around a panda.NodePath object
class PythonNodePath(NodePath):
@@ -41,14 +40,14 @@ class ObjectMgrBase:
def reset(self):
base.direct.deselectAllCB()
- for id in self.objects.keys():
+ for id in list(self.objects.keys()):
try:
self.objects[id][OG.OBJ_NP].removeNode()
except:
pass
del self.objects[id]
- for np in self.npIndex.keys():
+ for np in list(self.npIndex.keys()):
del self.npIndex[np]
self.objects = {}
@@ -179,13 +178,13 @@ class ObjectMgrBase:
funcName = objDef.createFunction[OG.FUNC_NAME]
funcArgs = copy.deepcopy(objDef.createFunction[OG.FUNC_ARGS])
- for pair in funcArgs.items():
+ for pair in list(funcArgs.items()):
if pair[1] == OG.ARG_NAME:
funcArgs[pair[0]] = nameStr
elif pair[1] == OG.ARG_PARENT:
funcArgs[pair[0]] = parent
- if type(funcName) == types.StringType:
+ if type(funcName) == str:
if funcName.startswith('.'):
# when it's using default objectHandler
if self.editor:
@@ -512,7 +511,7 @@ class ObjectMgrBase:
else:
newobjModel = loader.loadModel(model, okMissing=True)
if newobjModel is None:
- print "Can't load model %s"%model
+ print("Can't load model %s"%model)
return
self.flatten(newobjModel, model, objDef, uid)
newobj = PythonNodePath(newobjModel)
@@ -683,7 +682,7 @@ class ObjectMgrBase:
kwargs[key] = funcArgs[key]
undoKwargs[key] = funcArgs[key]
- if type(funcName) == types.StringType:
+ if type(funcName) == str:
if funcName.startswith('.'):
if self.editor:
func = Functor(getattr(self.editor, "objectHandler%s"%funcName), **kwargs)
diff --git a/direct/src/leveleditor/ObjectPalette.py b/direct/src/leveleditor/ObjectPalette.py
index 4b08ad1360..ff254cbb9c 100755
--- a/direct/src/leveleditor/ObjectPalette.py
+++ b/direct/src/leveleditor/ObjectPalette.py
@@ -14,7 +14,7 @@ Then you need implement ObjectPalette class inheriting ObjectPaletteBase,
and in the populate function you can define ObjectPalette tree structure.
"""
-from ObjectPaletteBase import *
+from .ObjectPaletteBase import *
class ObjectProp(ObjectBase):
def __init__(self, *args, **kw):
diff --git a/direct/src/leveleditor/ObjectPaletteBase.py b/direct/src/leveleditor/ObjectPaletteBase.py
index 1946926c89..5bbfe38e50 100755
--- a/direct/src/leveleditor/ObjectPaletteBase.py
+++ b/direct/src/leveleditor/ObjectPaletteBase.py
@@ -1,5 +1,5 @@
import copy
-import ObjectGlobals as OG
+from . import ObjectGlobals as OG
class ObjectGen:
""" Base class for obj definitions """
@@ -82,7 +82,7 @@ class ObjectPaletteBase:
def deleteStruct(self, name, deleteItems):
try:
item = self.data.pop(name)
- for key in self.dataStruct.keys():
+ for key in list(self.dataStruct.keys()):
if self.dataStruct[key] == name:
node = self.deleteStruct(key, deleteItems)
if node is not None:
@@ -98,7 +98,7 @@ class ObjectPaletteBase:
node = self.deleteStruct(name, deleteItems)
if node is not None:
deleteItems[name] = node
- for key in deleteItems.keys():
+ for key in list(deleteItems.keys()):
item = self.dataStruct.pop(key)
except:
return
@@ -126,7 +126,7 @@ class ObjectPaletteBase:
if newName == "":
return False
try:
- for key in self.dataStruct.keys():
+ for key in list(self.dataStruct.keys()):
if self.dataStruct[key] == oldName:
self.dataStruct[key] = newName
diff --git a/direct/src/leveleditor/ObjectPaletteUI.py b/direct/src/leveleditor/ObjectPaletteUI.py
index 4c9fa92d3d..bf84e3d492 100755
--- a/direct/src/leveleditor/ObjectPaletteUI.py
+++ b/direct/src/leveleditor/ObjectPaletteUI.py
@@ -2,8 +2,8 @@
Defines ObjectPalette tree UI
"""
import wx
-import cPickle as pickle
-from PaletteTreeCtrl import *
+from .PaletteTreeCtrl import *
+
class ObjectPaletteUI(wx.Panel):
def __init__(self, parent, editor):
diff --git a/direct/src/leveleditor/ObjectPropertyUI.py b/direct/src/leveleditor/ObjectPropertyUI.py
index 0be0910523..08adb8b784 100755
--- a/direct/src/leveleditor/ObjectPropertyUI.py
+++ b/direct/src/leveleditor/ObjectPropertyUI.py
@@ -10,8 +10,8 @@ from wx.lib.scrolledpanel import ScrolledPanel
from wx.lib.agw.cubecolourdialog import *
from direct.wxwidgets.WxSlider import *
from pandac.PandaModules import *
-import ObjectGlobals as OG
-import AnimGlobals as AG
+from . import ObjectGlobals as OG
+from . import AnimGlobals as AG
#----------------------------------------------------------------------
Key = PyEmbeddedImage(
@@ -495,14 +495,14 @@ class ObjectPropertyUI(ScrolledPanel):
sizer = wx.BoxSizer(wx.VERTICAL)
propNames = objDef.orderedProperties[:]
- for key in objDef.properties.keys():
+ for key in list(objDef.properties.keys()):
if key not in propNames:
propNames.append(key)
for key in propNames:
# handling properties mask
propMask = BitMask32()
- for modeKey in objDef.propertiesMask.keys():
+ for modeKey in list(objDef.propertiesMask.keys()):
if key in objDef.propertiesMask[modeKey]:
propMask |= modeKey
diff --git a/direct/src/leveleditor/PaletteTreeCtrl.py b/direct/src/leveleditor/PaletteTreeCtrl.py
index f774f0dac5..c4a5d46fce 100644
--- a/direct/src/leveleditor/PaletteTreeCtrl.py
+++ b/direct/src/leveleditor/PaletteTreeCtrl.py
@@ -2,8 +2,8 @@
Defines Palette tree control
"""
import wx
-import cPickle as pickle
-from ObjectPaletteBase import *
+from .ObjectPaletteBase import *
+
class PaletteTreeCtrl(wx.TreeCtrl):
def __init__(self, parent, treeStyle, rootName):
@@ -155,7 +155,7 @@ class PaletteTreeCtrl(wx.TreeCtrl):
if item != self.GetRootItem(): # prevent dragging root item
text = self.GetItemText(item)
- print "Starting drag'n'drop with %s..." % repr(text)
+ print("Starting drag'n'drop with %s..." % repr(text))
tdo = wx.TextDataObject(text)
tds = wx.DropSource(self)
diff --git a/direct/src/leveleditor/ProtoObjs.py b/direct/src/leveleditor/ProtoObjs.py
index a1bc137a3e..a8e2c7bd34 100755
--- a/direct/src/leveleditor/ProtoObjs.py
+++ b/direct/src/leveleditor/ProtoObjs.py
@@ -3,7 +3,7 @@ Palette for Prototyping
"""
import os
import imp
-import types
+
class ProtoObjs:
def __init__(self, name):
@@ -19,7 +19,7 @@ class ProtoObjs:
module = imp.load_module(moduleName, file, pathname, description)
self.data = module.protoData
except:
- print "%s doesn't exist"%(self.name)
+ print("%s doesn't exist"%(self.name))
return
def saveProtoData(self, f):
diff --git a/direct/src/leveleditor/ProtoObjsUI.py b/direct/src/leveleditor/ProtoObjsUI.py
index 67fb60f4b9..63222e3a2d 100755
--- a/direct/src/leveleditor/ProtoObjsUI.py
+++ b/direct/src/leveleditor/ProtoObjsUI.py
@@ -3,10 +3,9 @@ Defines ProtoObjs List UI
"""
import wx
import os
-import cPickle as pickl
from pandac.PandaModules import *
-from ProtoObjs import *
+from .ProtoObjs import *
class ProtoDropTarget(wx.PyDropTarget):
"""Implements drop target functionality to receive files, bitmaps and text"""
@@ -73,7 +72,7 @@ class ProtoObjsUI(wx.Panel):
self.SetDropTarget(ProtoDropTarget(self))
def populate(self):
- for key in self.protoObjs.data.keys():
+ for key in list(self.protoObjs.data.keys()):
self.add(self.protoObjs.data[key])
# All subclasses should implement this method
diff --git a/direct/src/leveleditor/ProtoPalette.py b/direct/src/leveleditor/ProtoPalette.py
index b796e712fa..0f8aacee3b 100755
--- a/direct/src/leveleditor/ProtoPalette.py
+++ b/direct/src/leveleditor/ProtoPalette.py
@@ -2,7 +2,7 @@
Palette for Prototyping
"""
-from ProtoPaletteBase import *
+from .ProtoPaletteBase import *
class ProtoPalette(ProtoPaletteBase):
def __init__(self):
diff --git a/direct/src/leveleditor/ProtoPaletteBase.py b/direct/src/leveleditor/ProtoPaletteBase.py
index 3c0c5bdd1c..9d9aa3775f 100755
--- a/direct/src/leveleditor/ProtoPaletteBase.py
+++ b/direct/src/leveleditor/ProtoPaletteBase.py
@@ -1,11 +1,9 @@
"""
Palette for Prototyping
"""
-import os
import imp
-import types
-from ObjectPaletteBase import *
+from .ObjectPaletteBase import *
class ProtoPaletteBase(ObjectPaletteBase):
def __init__(self):
@@ -14,9 +12,9 @@ class ProtoPaletteBase(ObjectPaletteBase):
assert self.dirname
def addItems(self):
- if type(protoData) == types.DictType:
- for key in protoData.keys():
- if type(protoData[key]) == types.DictType:
+ if type(protoData) == dict:
+ for key in list(protoData.keys()):
+ if type(protoData[key]) == dict:
self.add(key, parent)
self.addItems(protoData[key], key)
else:
@@ -30,7 +28,7 @@ class ProtoPaletteBase(ObjectPaletteBase):
self.data = module.protoData
self.dataStruct = module.protoDataStruct
except:
- print "protoPaletteData doesn't exist"
+ print("protoPaletteData doesn't exist")
return
#self.addItems()
@@ -39,14 +37,14 @@ class ProtoPaletteBase(ObjectPaletteBase):
if not f:
return
- for key in self.dataStruct.keys():
+ for key in list(self.dataStruct.keys()):
f.write("\t'%s':'%s',\n"%(key, self.dataStruct[key]))
def saveProtoData(self, f):
if not f:
return
- for key in self.data.keys():
+ for key in list(self.data.keys()):
if isinstance(self.data[key], ObjectBase):
f.write("\t'%s':ObjectBase(name='%s', model='%s', anims=%s, actor=%s),\n"%(key, self.data[key].name, self.data[key].model, self.data[key].anims, self.data[key].actor))
else:
diff --git a/direct/src/leveleditor/ProtoPaletteUI.py b/direct/src/leveleditor/ProtoPaletteUI.py
index 7c19e85754..d9f047b55f 100755
--- a/direct/src/leveleditor/ProtoPaletteUI.py
+++ b/direct/src/leveleditor/ProtoPaletteUI.py
@@ -3,9 +3,8 @@ Defines ProtoPalette tree UI
"""
import wx
import os
-import cPickle as pickl
from pandac.PandaModules import *
-from PaletteTreeCtrl import *
+from .PaletteTreeCtrl import *
class UniversalDropTarget(wx.PyDropTarget):
"""Implements drop target functionality to receive files, bitmaps and text"""
@@ -89,7 +88,7 @@ class ProtoPaletteUI(wx.Panel):
self.SetDropTarget(UniversalDropTarget(self.editor))
def populate(self):
- dataStructKeys = self.palette.dataStruct.keys()[:]
+ dataStructKeys = list(self.palette.dataStruct.keys())
self.tree.addTreeNodes(self.tree.GetRootItem(), self.palette.rootName, self.palette.dataStruct, dataStructKeys)
def OnBeginLabelEdit(self, event):
@@ -199,7 +198,7 @@ class ProtoPaletteUI(wx.Panel):
if self.opSort == self.opSortAlpha:
return cmp(data1, data2)
else:
- items = self.palette.data.keys()[:]
+ items = list(self.palette.data.keys())
index1 = items.index(data1)
index2 = items.index(data2)
return cmp(index1, index2)
diff --git a/direct/src/leveleditor/SceneGraphUI.py b/direct/src/leveleditor/SceneGraphUI.py
index 0a6ca41b69..f3c99e617b 100755
--- a/direct/src/leveleditor/SceneGraphUI.py
+++ b/direct/src/leveleditor/SceneGraphUI.py
@@ -1,7 +1,7 @@
"""
Defines Scene Graph tree UI
"""
-from SceneGraphUIBase import *
+from .SceneGraphUIBase import *
class SceneGraphUI(SceneGraphUIBase):
def __init__(self, parent, editor):
diff --git a/direct/src/leveleditor/SceneGraphUIBase.py b/direct/src/leveleditor/SceneGraphUIBase.py
index b8c4bc9b7e..c98cf8505c 100755
--- a/direct/src/leveleditor/SceneGraphUIBase.py
+++ b/direct/src/leveleditor/SceneGraphUIBase.py
@@ -2,20 +2,19 @@
Defines Scene Graph tree UI Base
"""
import wx
-import cPickle as pickle
from pandac.PandaModules import *
-from ActionMgr import *
+from .ActionMgr import *
-import ObjectGlobals as OG
+from . import ObjectGlobals as OG
class SceneGraphUIDropTarget(wx.TextDropTarget):
def __init__(self, editor):
- print "in SceneGraphUIDropTarget::init..."
+ print("in SceneGraphUIDropTarget::init...")
wx.TextDropTarget.__init__(self)
self.editor = editor
def OnDropText(self, x, y, text):
- print "in SceneGraphUIDropTarget::OnDropText..."
+ print("in SceneGraphUIDropTarget::OnDropText...")
self.editor.ui.sceneGraphUI.changeHierarchy(text, x, y)
class SceneGraphUIBase(wx.Panel):
@@ -299,7 +298,7 @@ class SceneGraphUIBase(wx.Panel):
if item != self.tree.GetRootItem(): # prevent dragging root item
text = self.tree.GetItemText(item)
- print "Starting SceneGraphUI drag'n'drop with %s..." % repr(text)
+ print("Starting SceneGraphUI drag'n'drop with %s..." % repr(text))
tdo = wx.TextDataObject(text)
tds = wx.DropSource(self.tree)
diff --git a/direct/src/motiontrail/MotionTrail.py b/direct/src/motiontrail/MotionTrail.py
index f678b34c7e..db891548ac 100644
--- a/direct/src/motiontrail/MotionTrail.py
+++ b/direct/src/motiontrail/MotionTrail.py
@@ -11,14 +11,14 @@ def remove_task ( ):
if (MotionTrail.task_added):
total_motion_trails = len (MotionTrail.motion_trail_list)
- if (total_motion_trails > 0):
- print "warning:", total_motion_trails, "motion trails still exist when motion trail task is removed"
+ if total_motion_trails > 0:
+ print("warning: %d motion trails still exist when motion trail task is removed" % (total_motion_trails))
MotionTrail.motion_trail_list = [ ]
taskMgr.remove (MotionTrail.motion_trail_task_name)
- print "MotionTrail task removed"
+ print("MotionTrail task removed")
MotionTrail.task_added = False
return
@@ -149,10 +149,10 @@ class MotionTrail(NodePath, DirectObject):
def print_matrix (self, matrix):
separator = ' '
- print matrix.getCell (0, 0), separator, matrix.getCell (0, 1), separator, matrix.getCell (0, 2), separator, matrix.getCell (0, 3)
- print matrix.getCell (1, 0), separator, matrix.getCell (1, 1), separator, matrix.getCell (1, 2), separator, matrix.getCell (1, 3)
- print matrix.getCell (2, 0), separator, matrix.getCell (2, 1), separator, matrix.getCell (2, 2), separator, matrix.getCell (2, 3)
- print matrix.getCell (3, 0), separator, matrix.getCell (3, 1), separator, matrix.getCell (3, 2), separator, matrix.getCell (3, 3)
+ print(matrix.getCell (0, 0), separator, matrix.getCell (0, 1), separator, matrix.getCell (0, 2), separator, matrix.getCell (0, 3))
+ print(matrix.getCell (1, 0), separator, matrix.getCell (1, 1), separator, matrix.getCell (1, 2), separator, matrix.getCell (1, 3))
+ print(matrix.getCell (2, 0), separator, matrix.getCell (2, 1), separator, matrix.getCell (2, 2), separator, matrix.getCell (2, 3))
+ print(matrix.getCell (3, 0), separator, matrix.getCell (3, 1), separator, matrix.getCell (3, 2), separator, matrix.getCell (3, 3))
def motion_trail_task (self, task):
@@ -379,8 +379,8 @@ class MotionTrail(NodePath, DirectObject):
elapsed_time = current_time - self.fade_start_time
if (elapsed_time < 0.0):
+ print("elapsed_time < 0: %f" % (elapsed_time))
elapsed_time = 0.0
- print "elapsed_time < 0", elapsed_time
if (elapsed_time < self.fade_time):
color_scale = (1.0 - (elapsed_time / self.fade_time)) * color_scale
diff --git a/direct/src/p3d/AppRunner.py b/direct/src/p3d/AppRunner.py
index 0fd46de469..4a59e20de6 100644
--- a/direct/src/p3d/AppRunner.py
+++ b/direct/src/p3d/AppRunner.py
@@ -13,7 +13,11 @@ __all__ = ["AppRunner", "dummyAppRunner", "ArgumentError"]
import sys
import os
-import __builtin__ as builtins
+
+if sys.version_info >= (3, 0):
+ import builtins
+else:
+ import __builtin__ as builtins
from direct.showbase import VFSImporter
from direct.showbase.DirectObject import DirectObject
diff --git a/direct/src/p3d/DeploymentTools.py b/direct/src/p3d/DeploymentTools.py
index 8d03fd94bc..5d63e0e6f5 100644
--- a/direct/src/p3d/DeploymentTools.py
+++ b/direct/src/p3d/DeploymentTools.py
@@ -5,7 +5,7 @@ to build for as many platforms as possible. """
__all__ = ["Standalone", "Installer"]
import os, sys, subprocess, tarfile, shutil, time, zipfile, socket, getpass, struct
-import gzip
+import gzip, plistlib
from io import BytesIO, TextIOWrapper
from direct.directnotify.DirectNotifyGlobal import *
from direct.showbase.AppRunnerGlobal import appRunner
@@ -22,6 +22,9 @@ try:
except ImportError:
pwd = None
+if sys.version_info >= (3, 0):
+ xrange = range
+
# Make sure this matches with the magic in p3dEmbedMain.cxx.
P3DEMBED_MAGIC = 0xFF3D3D00
@@ -758,20 +761,20 @@ class Installer:
desktopFile.setText()
desktopFile.makeDir()
desktop = open(desktopFile.toOsSpecific(), 'w')
- print >>desktop, "[Desktop Entry]"
- print >>desktop, "Name=%s" % self.fullname
- print >>desktop, "Exec=%s" % self.shortname.lower()
+ desktop.write("[Desktop Entry]\n")
+ desktop.write("Name=%s\n" % self.fullname)
+ desktop.write("Exec=%s\n" % self.shortname.lower())
if iconFile is not None:
- print >>desktop, "Icon=%s" % iconFile.getBasename()
+ desktop.write("Icon=%s\n" % iconFile.getBasename())
# Set the "Terminal" option based on whether or not a console env is requested
cEnv = self.standalone.tokens.get("console_environment", "")
if cEnv == "" or int(cEnv) == 0:
- print >>desktop, "Terminal=false"
+ desktop.write("Terminal=false\n")
else:
- print >>desktop, "Terminal=true"
+ desktop.write("Terminal=true\n")
- print >>desktop, "Type=Application"
+ desktop.write("Type=Application\n")
desktop.close()
if self.includeRequires or self.extracts:
@@ -942,45 +945,25 @@ class Installer:
Installer.notify.info("Generating %s.icns..." % self.shortname)
hasIcon = self.icon.makeICNS(Filename(hostDir, "%s.icns" % self.shortname))
- # Create the application plist file.
- # Although it might make more sense to use Python's plistlib module here,
- # it is not available on non-OSX systems before Python 2.6.
- plist = open(Filename(output, "Contents/Info.plist").toOsSpecific(), "w")
- print >>plist, ''
- print >>plist, ''
- print >>plist, ''
- print >>plist, ''
- print >>plist, '\tCFBundleDevelopmentRegion '
- print >>plist, '\tEnglish '
- print >>plist, '\tCFBundleDisplayName '
- print >>plist, '\t%s ' % self.fullname
- print >>plist, '\tCFBundleExecutable '
- print >>plist, '\t%s ' % exefile.getBasename()
+ # Create the application plist file using Python's plistlib module.
+ plist = {
+ 'CFBundleDevelopmentRegion': 'English',
+ 'CFBundleDisplayName': self.fullname,
+ 'CFBundleExecutable': exefile.getBasename(),
+ 'CFBundleIdentifier': '%s.%s' % (self.author, self.shortname),
+ 'CFBundleInfoDictionaryVersion': '6.0',
+ 'CFBundleName': self.shortname,
+ 'CFBundlePackageType': 'APPL',
+ 'CFBundleShortVersionString': self.version,
+ 'CFBundleVersion': self.version,
+ 'LSHasLocalizedDisplayName': False,
+ 'NSAppleScriptEnabled': False,
+ 'NSPrincipalClass': 'NSApplication',
+ }
if hasIcon:
- print >>plist, '\tCFBundleIconFile '
- print >>plist, '\t%s.icns ' % self.shortname
- print >>plist, '\tCFBundleIdentifier '
- print >>plist, '\t%s.%s ' % (self.authorid, self.shortname)
- print >>plist, '\tCFBundleInfoDictionaryVersion '
- print >>plist, '\t6.0 '
- print >>plist, '\tCFBundleName '
- print >>plist, '\t%s ' % self.shortname
- print >>plist, '\tCFBundlePackageType '
- print >>plist, '\tAPPL '
- print >>plist, '\tCFBundleShortVersionString '
- print >>plist, '\t%s ' % self.version
- print >>plist, '\tCFBundleVersion '
- print >>plist, '\t%s ' % self.version
- print >>plist, '\tLSHasLocalizedDisplayName '
- print >>plist, '\tNSAppleScriptEnabled '
- print >>plist, '\tNSPrincipalClass '
- print >>plist, '\tNSApplication '
- print >>plist, ' '
- print >>plist, ' '
- plist.close()
+ plist['CFBundleIconFile'] = self.shortname + '.icns'
+ plistlib.writePlist(plist, Filename(output, "Contents/Info.plist").toOsSpecific())
return output
def buildPKG(self, output, platform):
@@ -1221,73 +1204,73 @@ class Installer:
nsi = open(nsifile.toOsSpecific(), "w")
# Some global info
- print >>nsi, 'Name "%s"' % self.fullname
- print >>nsi, 'OutFile "%s"' % output.toOsSpecific()
+ nsi.write('Name "%s"\n' % self.fullname)
+ nsi.write('OutFile "%s"\n' % output.toOsSpecific())
if platform == 'win_amd64':
- print >>nsi, 'InstallDir "$PROGRAMFILES64\\%s"' % self.fullname
+ nsi.write('InstallDir "$PROGRAMFILES64\\%s"\n' % self.fullname)
else:
- print >>nsi, 'InstallDir "$PROGRAMFILES\\%s"' % self.fullname
- print >>nsi, 'SetCompress auto'
- print >>nsi, 'SetCompressor lzma'
- print >>nsi, 'ShowInstDetails nevershow'
- print >>nsi, 'ShowUninstDetails nevershow'
- print >>nsi, 'InstType "Typical"'
+ nsi.write('InstallDir "$PROGRAMFILES\\%s"\n' % self.fullname)
+ nsi.write('SetCompress auto\n')
+ nsi.write('SetCompressor lzma\n')
+ nsi.write('ShowInstDetails nevershow\n')
+ nsi.write('ShowUninstDetails nevershow\n')
+ nsi.write('InstType "Typical"\n')
# Tell Vista that we require admin rights
- print >>nsi, 'RequestExecutionLevel admin'
- print >>nsi
+ nsi.write('RequestExecutionLevel admin\n')
+ nsi.write('\n')
if self.offerRun:
- print >>nsi, 'Function launch'
- print >>nsi, ' ExecShell "open" "$INSTDIR\\%s.exe"' % self.shortname
- print >>nsi, 'FunctionEnd'
- print >>nsi
+ nsi.write('Function launch\n')
+ nsi.write(' ExecShell "open" "$INSTDIR\\%s.exe"\n' % self.shortname)
+ nsi.write('FunctionEnd\n')
+ nsi.write('\n')
if self.offerDesktopShortcut:
- print >>nsi, 'Function desktopshortcut'
+ nsi.write('Function desktopshortcut\n')
if icofile is None:
- print >>nsi, ' CreateShortcut "$DESKTOP\\%s.lnk" "$INSTDIR\\%s.exe"' % (self.fullname, self.shortname)
+ nsi.write(' CreateShortcut "$DESKTOP\\%s.lnk" "$INSTDIR\\%s.exe"\n' % (self.fullname, self.shortname))
else:
- print >>nsi, ' CreateShortcut "$DESKTOP\\%s.lnk" "$INSTDIR\\%s.exe" "" "$INSTDIR\\%s.ico"' % (self.fullname, self.shortname, self.shortname)
- print >>nsi, 'FunctionEnd'
- print >>nsi
+ nsi.write(' CreateShortcut "$DESKTOP\\%s.lnk" "$INSTDIR\\%s.exe" "" "$INSTDIR\\%s.ico"\n' % (self.fullname, self.shortname, self.shortname))
+ nsi.write('FunctionEnd\n')
+ nsi.write('\n')
- print >>nsi, '!include "MUI2.nsh"'
- print >>nsi, '!define MUI_ABORTWARNING'
+ nsi.write('!include "MUI2.nsh"\n')
+ nsi.write('!define MUI_ABORTWARNING\n')
if self.offerRun:
- print >>nsi, '!define MUI_FINISHPAGE_RUN'
- print >>nsi, '!define MUI_FINISHPAGE_RUN_NOTCHECKED'
- print >>nsi, '!define MUI_FINISHPAGE_RUN_FUNCTION launch'
- print >>nsi, '!define MUI_FINISHPAGE_RUN_TEXT "Run %s"' % self.fullname
+ nsi.write('!define MUI_FINISHPAGE_RUN\n')
+ nsi.write('!define MUI_FINISHPAGE_RUN_NOTCHECKED\n')
+ nsi.write('!define MUI_FINISHPAGE_RUN_FUNCTION launch\n')
+ nsi.write('!define MUI_FINISHPAGE_RUN_TEXT "Run %s"\n' % self.fullname)
if self.offerDesktopShortcut:
- print >>nsi, '!define MUI_FINISHPAGE_SHOWREADME ""'
- print >>nsi, '!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED'
- print >>nsi, '!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"'
- print >>nsi, '!define MUI_FINISHPAGE_SHOWREADME_FUNCTION desktopshortcut'
- print >>nsi
- print >>nsi, 'Var StartMenuFolder'
- print >>nsi, '!insertmacro MUI_PAGE_WELCOME'
+ nsi.write('!define MUI_FINISHPAGE_SHOWREADME ""\n')
+ nsi.write('!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED\n')
+ nsi.write('!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"\n')
+ nsi.write('!define MUI_FINISHPAGE_SHOWREADME_FUNCTION desktopshortcut\n')
+ nsi.write('\n')
+ nsi.write('Var StartMenuFolder\n')
+ nsi.write('!insertmacro MUI_PAGE_WELCOME\n')
if not self.licensefile.empty():
abs = Filename(self.licensefile)
abs.makeAbsolute()
- print >>nsi, '!insertmacro MUI_PAGE_LICENSE "%s"' % abs.toOsSpecific()
- print >>nsi, '!insertmacro MUI_PAGE_DIRECTORY'
- print >>nsi, '!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder'
- print >>nsi, '!insertmacro MUI_PAGE_INSTFILES'
- print >>nsi, '!insertmacro MUI_PAGE_FINISH'
- print >>nsi, '!insertmacro MUI_UNPAGE_WELCOME'
- print >>nsi, '!insertmacro MUI_UNPAGE_CONFIRM'
- print >>nsi, '!insertmacro MUI_UNPAGE_INSTFILES'
- print >>nsi, '!insertmacro MUI_UNPAGE_FINISH'
- print >>nsi, '!insertmacro MUI_LANGUAGE "English"'
+ nsi.write('!insertmacro MUI_PAGE_LICENSE "%s"\n' % abs.toOsSpecific())
+ nsi.write('!insertmacro MUI_PAGE_DIRECTORY\n')
+ nsi.write('!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder\n')
+ nsi.write('!insertmacro MUI_PAGE_INSTFILES\n')
+ nsi.write('!insertmacro MUI_PAGE_FINISH\n')
+ nsi.write('!insertmacro MUI_UNPAGE_WELCOME\n')
+ nsi.write('!insertmacro MUI_UNPAGE_CONFIRM\n')
+ nsi.write('!insertmacro MUI_UNPAGE_INSTFILES\n')
+ nsi.write('!insertmacro MUI_UNPAGE_FINISH\n')
+ nsi.write('!insertmacro MUI_LANGUAGE "English"\n')
# This section defines the installer.
- print >>nsi, 'Section "" SecCore'
- print >>nsi, ' SetOutPath "$INSTDIR"'
- print >>nsi, ' File "%s"' % exefile.toOsSpecific()
+ nsi.write('Section "" SecCore\n')
+ nsi.write(' SetOutPath "$INSTDIR"\n')
+ nsi.write(' File "%s"\n' % exefile.toOsSpecific())
if icofile is not None:
- print >>nsi, ' File "%s"' % icofile.toOsSpecific()
+ nsi.write(' File "%s"\n' % icofile.toOsSpecific())
for f in extrafiles:
- print >>nsi, ' File "%s"' % f.toOsSpecific()
+ nsi.write(' File "%s"\n' % f.toOsSpecific())
curdir = ""
for root, dirs, files in self.os_walk(hostDir.toOsSpecific()):
for name in files:
@@ -1297,39 +1280,39 @@ class Installer:
file.makeRelativeTo(hostDir)
outdir = file.getDirname().replace('/', '\\')
if curdir != outdir:
- print >>nsi, ' SetOutPath "$INSTDIR\\%s"' % outdir
+ nsi.write(' SetOutPath "$INSTDIR\\%s"\n' % outdir)
curdir = outdir
- print >>nsi, ' File "%s"' % (basefile.toOsSpecific())
- print >>nsi, ' SetOutPath "$INSTDIR"'
- print >>nsi, ' WriteUninstaller "$INSTDIR\\Uninstall.exe"'
- print >>nsi, ' ; Start menu items'
- print >>nsi, ' !insertmacro MUI_STARTMENU_WRITE_BEGIN Application'
- print >>nsi, ' CreateDirectory "$SMPROGRAMS\\$StartMenuFolder"'
+ nsi.write(' File "%s"\n' % (basefile.toOsSpecific()))
+ nsi.write(' SetOutPath "$INSTDIR"\n')
+ nsi.write(' WriteUninstaller "$INSTDIR\\Uninstall.exe"\n')
+ nsi.write(' ; Start menu items\n')
+ nsi.write(' !insertmacro MUI_STARTMENU_WRITE_BEGIN Application\n')
+ nsi.write(' CreateDirectory "$SMPROGRAMS\\$StartMenuFolder"\n')
if icofile is None:
- print >>nsi, ' CreateShortCut "$SMPROGRAMS\\$StartMenuFolder\\%s.lnk" "$INSTDIR\\%s.exe"' % (self.fullname, self.shortname)
+ nsi.write(' CreateShortCut "$SMPROGRAMS\\$StartMenuFolder\\%s.lnk" "$INSTDIR\\%s.exe"\n' % (self.fullname, self.shortname))
else:
- print >>nsi, ' CreateShortCut "$SMPROGRAMS\\$StartMenuFolder\\%s.lnk" "$INSTDIR\\%s.exe" "" "$INSTDIR\\%s.ico"' % (self.fullname, self.shortname, self.shortname)
- print >>nsi, ' CreateShortCut "$SMPROGRAMS\\$StartMenuFolder\\Uninstall.lnk" "$INSTDIR\\Uninstall.exe"'
- print >>nsi, ' !insertmacro MUI_STARTMENU_WRITE_END'
- print >>nsi, 'SectionEnd'
+ nsi.write(' CreateShortCut "$SMPROGRAMS\\$StartMenuFolder\\%s.lnk" "$INSTDIR\\%s.exe" "" "$INSTDIR\\%s.ico"\n' % (self.fullname, self.shortname, self.shortname))
+ nsi.write(' CreateShortCut "$SMPROGRAMS\\$StartMenuFolder\\Uninstall.lnk" "$INSTDIR\\Uninstall.exe"\n')
+ nsi.write(' !insertmacro MUI_STARTMENU_WRITE_END\n')
+ nsi.write('SectionEnd\n')
# This section defines the uninstaller.
- print >>nsi, 'Section Uninstall'
- print >>nsi, ' Delete "$INSTDIR\\%s.exe"' % self.shortname
+ nsi.write('Section Uninstall\n')
+ nsi.write(' Delete "$INSTDIR\\%s.exe"\n' % self.shortname)
if icofile is not None:
- print >>nsi, ' Delete "$INSTDIR\\%s.ico"' % self.shortname
+ nsi.write(' Delete "$INSTDIR\\%s.ico"\n' % self.shortname)
for f in extrafiles:
- print >>nsi, ' Delete "%s"' % f.getBasename()
- print >>nsi, ' Delete "$INSTDIR\\Uninstall.exe"'
- print >>nsi, ' RMDir /r "$INSTDIR"'
- print >>nsi, ' ; Desktop icon'
- print >>nsi, ' Delete "$DESKTOP\\%s.lnk"' % self.fullname
- print >>nsi, ' ; Start menu items'
- print >>nsi, ' !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder'
- print >>nsi, ' Delete "$SMPROGRAMS\\$StartMenuFolder\\%s.lnk"' % self.fullname
- print >>nsi, ' Delete "$SMPROGRAMS\\$StartMenuFolder\\Uninstall.lnk"'
- print >>nsi, ' RMDir "$SMPROGRAMS\\$StartMenuFolder"'
- print >>nsi, 'SectionEnd'
+ nsi.write(' Delete "%s"\n' % f.getBasename())
+ nsi.write(' Delete "$INSTDIR\\Uninstall.exe"\n')
+ nsi.write(' RMDir /r "$INSTDIR"\n')
+ nsi.write(' ; Desktop icon\n')
+ nsi.write(' Delete "$DESKTOP\\%s.lnk"\n' % self.fullname)
+ nsi.write(' ; Start menu items\n')
+ nsi.write(' !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder\n')
+ nsi.write(' Delete "$SMPROGRAMS\\$StartMenuFolder\\%s.lnk"\n' % self.fullname)
+ nsi.write(' Delete "$SMPROGRAMS\\$StartMenuFolder\\Uninstall.lnk"\n')
+ nsi.write(' RMDir "$SMPROGRAMS\\$StartMenuFolder"\n')
+ nsi.write('SectionEnd\n')
nsi.close()
cmd = [makensis]
@@ -1339,7 +1322,7 @@ class Installer:
else:
cmd.append("-" + o)
cmd.append(nsifile.toOsSpecific())
- print cmd
+ print(cmd)
try:
retcode = subprocess.call(cmd, shell = False)
if retcode != 0:
diff --git a/direct/src/p3d/HostInfo.py b/direct/src/p3d/HostInfo.py
index d97a39ea8e..4e5efdcd3e 100644
--- a/direct/src/p3d/HostInfo.py
+++ b/direct/src/p3d/HostInfo.py
@@ -244,10 +244,10 @@ class HostInfo:
# if we get here there may be some bigger problem. Just
# give the generic "big problem" message.
launcher.setPandaErrorCode(6)
- except NameError,e:
+ except NameError as e:
# no launcher
pass
- except AttributeError, e:
+ except AttributeError as e:
self.notify.warning("%s" % (str(e),))
pass
return False
@@ -653,8 +653,8 @@ class HostInfo:
packages = packages[:]
- for key, platforms in self.packages.items():
- for platform, package in platforms.items():
+ for key, platforms in list(self.packages.items()):
+ for platform, package in list(platforms.items()):
if package in packages:
self.__deletePackageFiles(package)
del platforms[platform]
diff --git a/direct/src/p3d/JavaScript.py b/direct/src/p3d/JavaScript.py
index 3208b7d7ba..b59deb1aa2 100644
--- a/direct/src/p3d/JavaScript.py
+++ b/direct/src/p3d/JavaScript.py
@@ -4,8 +4,6 @@ code that runs in a browser via the web plugin. """
__all__ = ["UndefinedObject", "Undefined", "ConcreteStruct", "BrowserObject", "MethodWrapper"]
-import types
-
class UndefinedObject:
""" This is a special object that is returned by the browser to
represent an "undefined" or "void" value, typically the value for
@@ -42,7 +40,7 @@ class ConcreteStruct:
returns all properties of the object. You can override this
to restrict the set of properties that are uploaded. """
- return self.__dict__.items()
+ return list(self.__dict__.items())
class BrowserObject:
""" This class provides the Python wrapper around some object that
@@ -109,7 +107,7 @@ class BrowserObject:
# problems.
needsResponse = False
- if parentObj is self.__runner.dom and attribName == 'eval' and len(args) == 1 and isinstance(args[0], types.StringTypes):
+ if parentObj is self.__runner.dom and attribName == 'eval' and len(args) == 1 and isinstance(args[0], str):
# As another special hack, we make dom.eval() a
# special case, and map it directly into an eval()
# call. If the string begins with 'void ', we further
@@ -207,7 +205,7 @@ class BrowserObject:
# for numeric keys so we can properly support Python's
# iterators, but we return KeyError for string keys to
# emulate mapping objects.
- if isinstance(key, types.StringTypes):
+ if isinstance(key, str):
raise KeyError(key)
else:
raise IndexError(key)
@@ -219,7 +217,7 @@ class BrowserObject:
propertyName = str(key),
value = value)
if not result:
- if isinstance(key, types.StringTypes):
+ if isinstance(key, str):
raise KeyError(key)
else:
raise IndexError(key)
@@ -228,7 +226,7 @@ class BrowserObject:
result = self.__runner.scriptRequest('del_property', self,
propertyName = str(key))
if not result:
- if isinstance(key, types.StringTypes):
+ if isinstance(key, str):
raise KeyError(key)
else:
raise IndexError(key)
@@ -269,7 +267,7 @@ class MethodWrapper:
# problems.
needsResponse = False
- if parentObj is self.__runner.dom and attribName == 'eval' and len(args) == 1 and isinstance(args[0], types.StringTypes):
+ if parentObj is self.__runner.dom and attribName == 'eval' and len(args) == 1 and isinstance(args[0], str):
# As another special hack, we make dom.eval() a
# special case, and map it directly into an eval()
# call. If the string begins with 'void ', we further
diff --git a/direct/src/p3d/PackageMerger.py b/direct/src/p3d/PackageMerger.py
index 9c2e1ac499..a22d8f5f2d 100644
--- a/direct/src/p3d/PackageMerger.py
+++ b/direct/src/p3d/PackageMerger.py
@@ -207,7 +207,7 @@ class PackageMerger:
xcontents.SetAttribute('max_age', str(self.maxAge))
self.contentsSeq.storeXml(xcontents)
- contents = self.contents.items()
+ contents = list(self.contents.items())
contents.sort()
for key, pe in contents:
xpackage = pe.makeXml()
diff --git a/direct/src/p3d/Packager.py b/direct/src/p3d/Packager.py
index 2f1e6a36e1..b46cda30b7 100644
--- a/direct/src/p3d/Packager.py
+++ b/direct/src/p3d/Packager.py
@@ -11,8 +11,6 @@ from panda3d.core import *
import sys
import os
import glob
-import string
-import types
import struct
import subprocess
import copy
@@ -574,7 +572,7 @@ class Packager:
# But first, make sure that all required modules are present.
missing = []
- moduleDict = dict(self.freezer.getModuleDefs()).keys()
+ moduleDict = dict(self.freezer.getModuleDefs())
for module in self.requiredModules:
if module not in moduleDict:
missing.append(module)
@@ -1228,7 +1226,7 @@ class Packager:
filenames = []
for line in lines:
- if line[0] not in string.whitespace:
+ if not line[0].isspace():
continue
line = line.strip()
s = line.find(' (compatibility')
@@ -1659,9 +1657,9 @@ class Packager:
xconfig = TiXmlElement('config')
for variable, value in self.configs.items():
- if isinstance(value, types.UnicodeType):
+ if sys.version_info < (3, 0) and isinstance(value, unicode):
xconfig.SetAttribute(variable, value.encode('utf-8'))
- elif isinstance(value, types.BooleanType):
+ elif isinstance(value, bool):
# True or False must be encoded as 1 or 0.
xconfig.SetAttribute(variable, str(int(value)))
else:
@@ -2190,7 +2188,7 @@ class Packager:
if package not in self.requires:
self.requires.append(package)
- for lowerName in package.targetFilenames.keys():
+ for lowerName in package.targetFilenames:
ext = Filename(lowerName).getExtension()
if ext not in self.packager.nonuniqueExtensions:
self.skipFilenames[lowerName] = True
@@ -2726,7 +2724,7 @@ class Packager:
packageNames.append(package.packageName)
if packageNames:
- from PatchMaker import PatchMaker
+ from .PatchMaker import PatchMaker
pm = PatchMaker(self.installDir)
pm.buildPatches(packageNames = packageNames)
@@ -2759,7 +2757,7 @@ class Packager:
# By convention, the existence of a method of this class named
# do_foo(self) is sufficient to define a pdef method call
# foo().
- for methodName in self.__class__.__dict__.keys():
+ for methodName in list(self.__class__.__dict__.keys()):
if methodName.startswith('do_'):
name = methodName[3:]
c = func_closure(name)
@@ -3147,14 +3145,14 @@ class Packager:
while p < len(version):
# Scan to the first digit.
w = ''
- while p < len(version) and version[p] not in string.digits:
+ while p < len(version) and not version[p].isdigit():
w += version[p]
p += 1
words.append(w)
# Scan to the end of the string of digits.
w = ''
- while p < len(version) and version[p] in string.digits:
+ while p < len(version) and version[p].isdigit():
w += version[p]
p += 1
if w:
@@ -3233,7 +3231,7 @@ class Packager:
if not self.currentPackage:
raise OutsideOfPackageError
- for keyword, value in kw.items():
+ for keyword, value in list(kw.items()):
self.currentPackage.configs[keyword] = value
def do_require(self, *args, **kw):
@@ -3917,17 +3915,10 @@ class metaclass_def(type):
return type.__new__(self, name, bases, dict)
-class class_p3d:
- __metaclass__ = metaclass_def
- pass
-
-class class_package:
- __metaclass__ = metaclass_def
- pass
-
-class class_solo:
- __metaclass__ = metaclass_def
- pass
+# Define these dynamically to stay compatible with Python 2 and 3.
+class_p3d = metaclass_def(str('class_p3d'), (), {})
+class_package = metaclass_def(str('class_package'), (), {})
+class_solo = metaclass_def(str('class_solo'), (), {})
class func_closure:
diff --git a/direct/src/p3d/PatchMaker.py b/direct/src/p3d/PatchMaker.py
index 485ad0d0e9..b48ad80f24 100644
--- a/direct/src/p3d/PatchMaker.py
+++ b/direct/src/p3d/PatchMaker.py
@@ -180,7 +180,7 @@ class PatchMaker:
result = Filename.temporary('', 'patch_')
p = Patchfile()
if not p.apply(patchFilename, origFile, result):
- print "Internal patching failed: %s" % (patchFilename)
+ print("Internal patching failed: %s" % (patchFilename))
return None
return result
@@ -345,7 +345,7 @@ class PatchMaker:
packageDescFullpath = Filename(self.patchMaker.installDir, self.packageDesc)
self.doc = TiXmlDocument(packageDescFullpath.toOsSpecific())
if not self.doc.LoadFile():
- print "Couldn't read %s" % (packageDescFullpath)
+ print("Couldn't read %s" % (packageDescFullpath))
return False
xpackage = self.doc.FirstChildElement('package')
@@ -537,7 +537,7 @@ class PatchMaker:
packageSeq.storeXml(xpackage, 'seq')
doc.SaveFile()
else:
- print "Couldn't read %s" % (importDescFullpath)
+ print("Couldn't read %s" % (importDescFullpath))
if self.contentsDocPackage:
# Now that we've rewritten the xml file, we have to
@@ -633,7 +633,7 @@ class PatchMaker:
doc = TiXmlDocument(contentsFilename.toOsSpecific())
if not doc.LoadFile():
# Couldn't read file.
- print "couldn't read %s" % (contentsFilename)
+ print("couldn't read %s" % (contentsFilename))
return False
xcontents = doc.FirstChildElement('contents')
@@ -740,7 +740,7 @@ class PatchMaker:
remainingNames.remove(package.packageName)
if remainingNames:
- print "Unknown packages: %s" % (remainingNames,)
+ print("Unknown packages: %s" % (remainingNames,))
def processAllPackages(self):
""" Walks through the list of packages, and builds missing
@@ -803,7 +803,7 @@ class PatchMaker:
# No original version to patch from.
return False
- print "Building patch from %s to %s" % (printOrigName, printNewName)
+ print("Building patch from %s to %s" % (printOrigName, printNewName))
patchFilename.unlink()
p = Patchfile() # The C++ class
if p.build(origFilename, newFilename, patchFilename):
diff --git a/direct/src/p3d/SeqValue.py b/direct/src/p3d/SeqValue.py
index d41cfd250b..68b655bce3 100644
--- a/direct/src/p3d/SeqValue.py
+++ b/direct/src/p3d/SeqValue.py
@@ -1,7 +1,5 @@
__all__ = ["SeqValue"]
-import types
-
class SeqValue:
""" This represents a sequence value read from a contents.xml
@@ -21,22 +19,22 @@ class SeqValue:
def set(self, value):
""" Sets the seq from the indicated value of unspecified
type. """
- if isinstance(value, types.TupleType):
+ if isinstance(value, tuple):
self.setFromTuple(value)
- elif isinstance(value, types.StringTypes):
+ elif isinstance(value, str):
self.setFromString(value)
else:
raise TypeError('Invalid sequence type: %s' % (value,))
def setFromTuple(self, value):
""" Sets the seq from the indicated tuple of integers. """
- assert isinstance(value, types.TupleType)
+ assert isinstance(value, tuple)
self.value = value
def setFromString(self, value):
""" Sets the seq from the indicated string of dot-separated
integers. Raises ValueError on error. """
- assert isinstance(value, types.StringTypes)
+ assert isinstance(value, str)
self.value = ()
if value:
diff --git a/direct/src/p3d/packp3d.py b/direct/src/p3d/packp3d.py
index a33a49e2d4..dee4fa2656 100755
--- a/direct/src/p3d/packp3d.py
+++ b/direct/src/p3d/packp3d.py
@@ -100,7 +100,6 @@ import sys
import os
import getopt
import glob
-import direct
from direct.p3d import Packager
from panda3d.core import *
@@ -159,11 +158,11 @@ def makePackedApp(args):
elif option == '-D':
allowPythonDev = True
elif option == '-h':
- print usageText % (
+ print(usageText % (
PandaSystem.getPackageVersionString(),
PandaSystem.getPackageHostUrl(),
os.path.split(sys.argv[0])[1],
- '%s.%s' % (sys.version_info[0], sys.version_info[1]))
+ '%s.%s' % (sys.version_info[0], sys.version_info[1])))
sys.exit(0)
if not appFilename:
@@ -228,13 +227,13 @@ def makePackedApp(args):
except Packager.PackagerError:
# Just print the error message and exit gracefully.
inst = sys.exc_info()[1]
- print inst.args[0]
+ print(inst.args[0])
sys.exit(1)
try:
makePackedApp(sys.argv[1:])
-except ArgumentError, e:
- print e.args[0]
+except ArgumentError as e:
+ print(e.args[0])
sys.exit(1)
# An explicit call to exit() is required to exit the program, when
diff --git a/direct/src/p3d/panda3d.pdef b/direct/src/p3d/panda3d.pdef
index 4c6588622f..59e53cb39b 100644
--- a/direct/src/p3d/panda3d.pdef
+++ b/direct/src/p3d/panda3d.pdef
@@ -97,12 +97,16 @@ class panda3d(package):
excludeModule('wx',
'direct.showbase.WxGlobal')
- excludeModule('Tkinter', 'Pmw',
+ excludeModule('Tkinter', 'tkinter', 'Pmw', 'tkinter.simpledialog',
'direct.showbase.TkGlobal',
'direct.tkpanels', 'direct.tkwidgets',
'tkCommonDialog', 'tkMessageBox', 'tkSimpleDialog')
- excludeModule('MySQLdb', '_mysql')
+ excludeModule('MySQLdb', 'MySQLdb.connections', 'MySQLdb.constants',
+ 'MySQLdb.converters', '_mysql')
+
+ # Some code in distributed conditionally imports these.
+ excludeModule('otp.ai', 'otp.ai.AIZoneData')
# Most of the core Panda3D DLL's will be included implicitly due to
# being referenced by the above Python code. Here we name a few more
@@ -141,14 +145,14 @@ class morepy(package):
config(display_name = "Python standard library")
require('panda3d')
- module('string', 're', 'struct', 'difflib', 'StringIO', 'StringIO',
+ module('string', 're', 'struct', 'difflib',
'textwrap', 'codecs', 'unicodedata', 'stringprep', 'datetime',
'calendar', 'collections', 'heapq', 'bisect', 'array',
'sched', 'queue', 'weakref', 'types', 'copy', 'pprint',
'numbers', 'math', 'cmath', 'decimal', 'fractions',
'random', 'itertools', 'functools', 'operator', 'os.path',
'fileinput', 'filecmp', 'tempfile', 'glob', 'fnmatch', 'linecache',
- 'shutil', 'macpath', 'pickle', 'shelve', 'marshal', 'bsddb', 'zlib',
+ 'shutil', 'macpath', 'pickle', 'shelve', 'marshal', 'zlib',
'gzip', 'bz2', 'zipfile', 'tarfile', 'csv', 'netrc',
'xdrlib', 'plistlib', 'hashlib', 'hmac', 'os',
'time', 'optparse', 'getopt', 'logging', 'logging.*')
@@ -167,8 +171,8 @@ class morepy(package):
'wave', 'chunk', 'colorsys', 'imghdr', 'sndhdr',
'ossaudiodev', 'gettext', 'locale', 'cmd', 'shlex',
'pydoc', 'doctest', 'unittest', 'test',
- 'bdb', 'pdb', 'hotshot', 'timeit', 'trace', 'sys', '__builtin__')
- module('future_builtins', 'warnings', 'contextlib', 'abc',
+ 'bdb', 'pdb', 'timeit', 'trace', 'sys')
+ module('warnings', 'contextlib', 'abc',
'atexit', 'traceback', '__future__', 'gc', 'inspect',
'site', 'fpectl', 'code', 'codeop', 'zipimport', 'pkgutil',
'modulefinder', 'runpy', 'parser', 'symtable', 'symbol',
@@ -191,13 +195,14 @@ class morepy(package):
# Removed because they were obsolete
module('Bastion', 'rexec', 'commands', 'dircache', 'dl', 'fpformat',
'htmllib', 'imageop', 'mhlib', 'popen2', 'sgmllib', 'stat',
- 'statvfs', 'thread', 'UserDict', 'UserList', 'UserString')
+ 'statvfs', 'thread', 'UserDict', 'UserList', 'UserString',
+ 'future_builtins', 'hotshot', 'bsddb')
# Renamed to fix PEP8 violations
module('_winreg', 'ConfigParser', 'copy_reg', 'SocketServer')
# C and Python implementations of the same interface were merged
- module('cPickle', 'cStringIO')
+ module('cPickle', 'cStringIO', 'StringIO')
# Renamed because of poorly chosen names
- module('repr', 'test.test_support')
+ module('repr', 'test.test_support', '__builtins__')
# Modules that got grouped under packages
module('anydbm', 'whichdb', 'dbm', 'dumbdbm', 'gdbm', 'dbhash')
module('HTMLParser', 'htmlentitydefs')
@@ -209,7 +214,7 @@ class morepy(package):
# Renamed to fix PEP8 violations
module('winreg', 'configparser', 'copyreg', 'socketserver')
# Renamed because of poorly chosen names
- module('reprlib', 'test.support')
+ module('reprlib', 'test.support', 'builtins')
# Modules that got grouped under packages
module('dbm')
module('html')
diff --git a/direct/src/p3d/pdeploy.py b/direct/src/p3d/pdeploy.py
index 0b0a77f834..f98d10b65d 100644
--- a/direct/src/p3d/pdeploy.py
+++ b/direct/src/p3d/pdeploy.py
@@ -151,8 +151,8 @@ from panda3d.core import Filename, PandaSystem
def usage(code, msg = ''):
if not msg:
- print >> sys.stderr, usageText % {'prog' : os.path.split(sys.argv[0])[1]}
- print >> sys.stderr, msg
+ sys.stderr.write(usageText % {'prog' : os.path.split(sys.argv[0])[1]})
+ sys.stderr.write(msg + '\n')
sys.exit(code)
shortname = ""
@@ -173,7 +173,7 @@ omitDefaultCheckboxes = False
try:
opts, args = getopt.getopt(sys.argv[1:], 'n:N:v:o:t:P:csOl:L:a:A:e:i:h')
-except getopt.error, msg:
+except getopt.error as msg:
usage(1, msg or 'Invalid option')
for opt, arg in opts:
@@ -213,7 +213,7 @@ for opt, arg in opts:
usage(0)
else:
msg = 'illegal option: ' + flag
- print msg
+ print(msg)
sys.exit(1, msg)
if not args or len(args) != 2:
@@ -223,32 +223,32 @@ if not args or len(args) != 2:
appFilename = Filename.fromOsSpecific(args[0])
if appFilename.getExtension().lower() != 'p3d':
- print 'Application filename must end in ".p3d".'
+ print('Application filename must end in ".p3d".')
sys.exit(1)
deploy_mode = args[1].lower()
if not appFilename.exists():
- print 'Application filename does not exist!'
+ print('Application filename does not exist!')
sys.exit(1)
if shortname == '':
shortname = appFilename.getBasenameWoExtension()
if shortname.lower() != shortname or ' ' in shortname:
- print '\nProvided short name should be lowercase, and may not contain spaces!\n'
+ print('\nProvided short name should be lowercase, and may not contain spaces!\n')
if version == '' and deploy_mode == 'installer':
- print '\nA version number is required in "installer" mode.\n'
+ print('\nA version number is required in "installer" mode.\n')
sys.exit(1)
if not outputDir:
- print '\nYou must name the output directory with the -o parameter.\n'
+ print('\nYou must name the output directory with the -o parameter.\n')
sys.exit(1)
if not outputDir.exists():
- print '\nThe specified output directory does not exist!\n'
+ print('\nThe specified output directory does not exist!\n')
sys.exit(1)
elif not outputDir.isDirectory():
- print '\nThe specified output directory is a file!\n'
+ print('\nThe specified output directory is a file!\n')
sys.exit(1)
if deploy_mode == 'standalone':
@@ -287,8 +287,8 @@ elif deploy_mode == 'installer':
if authoremail:
i.authoremail = authoremail
if not authorname or not authoremail or not authorid:
- print "Using author \"%s\" <%s> with ID %s" % \
- (i.authorname, i.authoremail, i.authorid)
+ print("Using author \"%s\" <%s> with ID %s" % \
+ (i.authorname, i.authoremail, i.authorid))
# Add the supplied icon images
if len(iconFiles) > 0:
@@ -296,7 +296,7 @@ elif deploy_mode == 'installer':
i.icon = Icon()
for iconFile in iconFiles:
if not i.icon.addImage(iconFile):
- print '\nFailed to add icon image "%s"!\n' % iconFile
+ print('\nFailed to add icon image "%s"!\n' % iconFile)
failed = True
if failed:
sys.exit(1)
@@ -323,32 +323,32 @@ elif deploy_mode == 'html':
if "data" not in tokens:
tokens["data"] = appFilename.getBasename()
- print "Creating %s.html..." % shortname
+ print("Creating %s.html..." % shortname)
html = open(Filename(outputDir, shortname + ".html").toOsSpecific(), "w")
- print >>html, ""
- print >>html, ""
- print >>html, " "
- print >>html, " %s " % fullname
- print >>html, " %s \n" % fullname)
+ html.write(" >html, "%s=\"%s\"" % (key, value.replace('"', '\\"')),
+ html.write(" %s=\"%s\"" % (key, value.replace('"', '\\"')))
if "width" not in tokens:
- print >>html, "width=\"%s\"" % w,
+ html.write(" width=\"%s\"" % w)
if "height" not in tokens:
- print >>html, "height=\"%s\"" % h,
- print >>html, "type=\"application/x-panda3d\">"
- print >>html, " " % (w, h)
+ html.write(" height=\"%s\"" % h)
+ html.write(" type=\"application/x-panda3d\">")
+ html.write(" \n" % (w, h))
for key, value in tokens.items():
- print >>html, " "
- print >>html, " "
- print >>html, " "
- print >>html, ""
+ html.write(" '
cycleBySyntax += '%s' % key
objAlreadyRepresented = True
- elif type(obj) is types.DictType:
+ elif type(obj) is dict:
cycleBySyntax += '{'
# get object referred to by dict
val = objs[index+1]
- for key, value in obj.iteritems():
+ for key, value in obj.items():
if value is val:
break
yield None
@@ -247,10 +251,10 @@ class GarbageReport(Job):
key = ''
cycleBySyntax += '%s}' % fastRepr(key)
objAlreadyRepresented = True
- elif type(obj) in (types.TupleType, types.ListType):
+ elif type(obj) in (tuple, list):
brackets = {
- types.TupleType: '()',
- types.ListType: '[]',
+ tuple: '()',
+ list: '[]',
}[type(obj)]
# get object being referenced by container
nextObj = objs[index+1]
@@ -508,16 +512,16 @@ class GarbageReport(Job):
candidateCycle, curId, numDelInstances, resumeIndex = stateStack.pop()
if self.notify.getDebug():
if self._args.delOnly:
- print 'restart: %s root=%s cur=%s numDelInstances=%s resume=%s' % (
- candidateCycle, rootId, curId, numDelInstances, resumeIndex)
+ print('restart: %s root=%s cur=%s numDelInstances=%s resume=%s' % (
+ candidateCycle, rootId, curId, numDelInstances, resumeIndex))
else:
- print 'restart: %s root=%s cur=%s resume=%s' % (
- candidateCycle, rootId, curId, resumeIndex)
+ print('restart: %s root=%s cur=%s resume=%s' % (
+ candidateCycle, rootId, curId, resumeIndex))
for index in xrange(resumeIndex, len(self.referentsByNumber[curId])):
yield None
refId = self.referentsByNumber[curId][index]
if self.notify.getDebug():
- print ' : %s -> %s' % (curId, refId)
+ print(' : %s -> %s' % (curId, refId))
if refId == rootId:
# we found a cycle! mark it down and move on to the next refId
normCandidateCycle = self._getNormalizedCycle(candidateCycle)
@@ -527,7 +531,7 @@ class GarbageReport(Job):
# cleaned up by Python
if (not self._args.delOnly) or numDelInstances >= 1:
if self.notify.getDebug():
- print ' FOUND: ', normCandidateCycle + [normCandidateCycle[0],]
+ print(' FOUND: ', normCandidateCycle + [normCandidateCycle[0],])
cycles.append(normCandidateCycle + [normCandidateCycle[0],])
uniqueCycleSets.add(normCandidateCycleTuple)
elif refId in candidateCycle:
@@ -562,9 +566,9 @@ def checkForGarbageLeaks():
numGarbage = len(gc.garbage)
if (numGarbage > 0 and config.GetBool('auto-garbage-logging', 0)):
if (numGarbage != _CFGLGlobals.LastNumGarbage):
- print
+ print("")
gr = GarbageReport('found garbage', threaded=False, collect=False)
- print
+ print("")
_CFGLGlobals.LastNumGarbage = numGarbage
_CFGLGlobals.LastNumCycles = gr.getNumCycles()
messenger.send(GarbageCycleCountAnnounceEvent, [gr.getDesc2numDict()])
diff --git a/direct/src/showbase/Job.py b/direct/src/showbase/Job.py
index 4eb511d9a8..02407b29c4 100755
--- a/direct/src/showbase/Job.py
+++ b/direct/src/showbase/Job.py
@@ -44,7 +44,7 @@ class Job(DirectObject):
#
# when done, yield Job.Done
#
- raise "don't call down"
+ raise NotImplementedError("don't call down")
def getPriority(self):
return self._priority
@@ -112,14 +112,14 @@ if __debug__: # __dev__ not yet available at this point
while True:
while self._accum < 100:
self._accum += 1
- print 'counter = %s, accum = %s' % (self._counter, self._accum)
+ print('counter = %s, accum = %s' % (self._counter, self._accum))
yield None
self._accum = 0
self._counter += 1
if self._counter >= 100:
- print 'Job.Done'
+ print('Job.Done')
self.printingEnd()
yield Job.Done
else:
diff --git a/direct/src/showbase/JobManager.py b/direct/src/showbase/JobManager.py
index 3474b42f18..0c2ab09bbf 100755
--- a/direct/src/showbase/JobManager.py
+++ b/direct/src/showbase/JobManager.py
@@ -106,7 +106,7 @@ class JobManager:
job.resume()
while True:
try:
- result = gen.next()
+ result = next(gen)
except StopIteration:
# Job didn't yield Job.Done, it ran off the end and returned
# treat it as if it returned Job.Done
@@ -137,7 +137,7 @@ class JobManager:
def _getSortedPriorities(self):
# returns all job priorities in ascending order
- priorities = self._pri2jobId2job.keys()
+ priorities = list(self._pri2jobId2job.keys())
priorities.sort()
return priorities
@@ -152,11 +152,11 @@ class JobManager:
if self._jobIdGenerator is None:
# round-robin the jobs, giving high-priority jobs more timeslices
self._jobIdGenerator = flywheel(
- self._jobId2timeslices.keys(),
+ list(self._jobId2timeslices.keys()),
countFunc = lambda jobId: self._jobId2timeslices[jobId])
try:
# grab the next jobId in the sequence
- jobId = self._jobIdGenerator.next()
+ jobId = next(self._jobIdGenerator)
except StopIteration:
self._jobIdGenerator = None
continue
@@ -181,7 +181,7 @@ class JobManager:
job.resume()
while globalClock.getRealTime() < endT:
try:
- result = gen.next()
+ result = next(gen)
except StopIteration:
# Job didn't yield Job.Done, it ran off the end and returned
# treat it as if it returned Job.Done
diff --git a/direct/src/showbase/JobManagerGlobal.py b/direct/src/showbase/JobManagerGlobal.py
index c5f591715d..767f4ce342 100755
--- a/direct/src/showbase/JobManagerGlobal.py
+++ b/direct/src/showbase/JobManagerGlobal.py
@@ -1,5 +1,5 @@
__all__ = ['jobMgr']
-import JobManager
+from . import JobManager
jobMgr = JobManager.JobManager()
diff --git a/direct/src/showbase/LeakDetectors.py b/direct/src/showbase/LeakDetectors.py
index 92bc944fc8..1124d1301d 100755
--- a/direct/src/showbase/LeakDetectors.py
+++ b/direct/src/showbase/LeakDetectors.py
@@ -3,14 +3,20 @@
from pandac.PandaModules import *
from direct.showbase.DirectObject import DirectObject
from direct.showbase.Job import Job
-import __builtin__, gc
+import gc, sys
+
+if sys.version_info >= (3, 0):
+ import builtins
+else:
+ import __builtin__ as builtins
+
class LeakDetector:
def __init__(self):
# put this object just under __builtins__ where the
# ContainerLeakDetector will find it quickly
- if not hasattr(__builtin__, "leakDetectors"):
- __builtin__.leakDetectors = {}
+ if not hasattr(builtins, "leakDetectors"):
+ builtins.leakDetectors = {}
self._leakDetectorsKey = self.getLeakDetectorKey()
if __dev__:
assert self._leakDetectorsKey not in leakDetectors
@@ -52,7 +58,7 @@ class ObjectTypesLeakDetector(LeakDetector):
self._thisLdGen = 0
def destroy(self):
- for ld in self._type2ld.itervalues():
+ for ld in self._type2ld.values():
ld.destroy()
LeakDetector.destroy(self)
@@ -133,7 +139,7 @@ class CppMemoryUsage(LeakDetector):
class TaskLeakDetectorBase:
def _getTaskNamePattern(self, taskName):
# get a generic string pattern from a task name by removing numeric characters
- for i in xrange(10):
+ for i in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9):
taskName = taskName.replace('%s' % i, '')
return taskName
@@ -165,7 +171,7 @@ class TaskLeakDetector(LeakDetector, TaskLeakDetectorBase):
self._taskName2collector = {}
def destroy(self):
- for taskName, collector in self._taskName2collector.iteritems():
+ for taskName, collector in self._taskName2collector.items():
collector.destroy()
del self._taskName2collector
LeakDetector.destroy(self)
@@ -189,7 +195,7 @@ class TaskLeakDetector(LeakDetector, TaskLeakDetectorBase):
class MessageLeakDetectorBase:
def _getMessageNamePattern(self, msgName):
# get a generic string pattern from a message name by removing numeric characters
- for i in xrange(10):
+ for i in (0, 1, 2, 3, 4, 5, 6, 7, 8, 9):
msgName = msgName.replace('%s' % i, '')
return msgName
@@ -266,7 +272,7 @@ class MessageTypesLeakDetector(LeakDetector, MessageLeakDetectorBase):
if self._createJob:
self._createJob.destroy()
self._createJob = None
- for msgName, detector in self._msgName2detector.iteritems():
+ for msgName, detector in self._msgName2detector.items():
detector.destroy()
del self._msgName2detector
LeakDetector.destroy(self)
@@ -342,7 +348,7 @@ class MessageListenerTypesLeakDetector(LeakDetector):
if self._createJob:
self._createJob.destroy()
self._createJob = None
- for typeName, detector in self._typeName2detector.iteritems():
+ for typeName, detector in self._typeName2detector.items():
detector.destroy()
del self._typeName2detector
LeakDetector.destroy(self)
diff --git a/direct/src/showbase/Loader.py b/direct/src/showbase/Loader.py
index 9521df23ef..5aca6c4042 100644
--- a/direct/src/showbase/Loader.py
+++ b/direct/src/showbase/Loader.py
@@ -6,7 +6,6 @@ from panda3d.core import *
from panda3d.core import Loader as PandaLoader
from direct.directnotify.DirectNotifyGlobal import *
from direct.showbase.DirectObject import DirectObject
-import types
# You can specify a phaseChecker callback to check
# a modelPath to see if it is being loaded in the correct
@@ -139,8 +138,7 @@ class Loader(DirectObject):
if allowInstance:
loaderOptions.setFlags(loaderOptions.getFlags() | LoaderOptions.LFAllowInstance)
- if isinstance(modelPath, types.StringTypes) or \
- isinstance(modelPath, Filename):
+ if not isinstance(modelPath, (tuple, list, set)):
# We were given a single model pathname.
modelList = [modelPath]
if phaseChecker:
@@ -270,8 +268,7 @@ class Loader(DirectObject):
# Maybe we were given a node
modelNode = model
- elif isinstance(model, types.StringTypes) or \
- isinstance(model, Filename):
+ elif isinstance(model, (str, Filename)):
# If we were given a filename, we have to ask the loader
# to resolve it for us.
options = LoaderOptions(LoaderOptions.LFSearch | LoaderOptions.LFNoDiskCache | LoaderOptions.LFCacheOnly)
@@ -284,7 +281,7 @@ class Loader(DirectObject):
assert Loader.notify.debug("%s resolves to %s" % (model, modelNode.getFullpath()))
else:
- raise 'Invalid parameter to unloadModel: %s' % (model)
+ raise TypeError('Invalid parameter to unloadModel: %s' % (model))
assert Loader.notify.debug("Unloading model: %s" % (modelNode.getFullpath()))
ModelPool.releaseModel(modelNode)
@@ -301,8 +298,7 @@ class Loader(DirectObject):
else:
loaderOptions = LoaderOptions(loaderOptions)
- if isinstance(modelPath, types.StringTypes) or \
- isinstance(modelPath, Filename):
+ if not isinstance(modelPath, (tuple, list, set)):
# We were given a single model pathname.
modelList = [modelPath]
nodeList = [node]
@@ -795,14 +791,10 @@ class Loader(DirectObject):
just as in loadModel(); otherwise, the loading happens before
loadSound() returns."""
- if isinstance(soundPath, types.StringTypes) or \
- isinstance(soundPath, Filename):
+ if not isinstance(soundPath, (MovieAudio, tuple, list, set)):
# We were given a single sound pathname.
soundList = [soundPath]
gotList = False
- elif isinstance(soundPath, MovieAudio):
- soundList = [soundPath]
- gotList = False
else:
# Assume we were given a list of sound pathnames.
soundList = soundPath
diff --git a/direct/src/showbase/Messenger.py b/direct/src/showbase/Messenger.py
index e9f9241646..20c02ce17a 100644
--- a/direct/src/showbase/Messenger.py
+++ b/direct/src/showbase/Messenger.py
@@ -3,7 +3,7 @@
__all__ = ['Messenger']
-from PythonUtil import *
+from .PythonUtil import *
from direct.directnotify import DirectNotifyGlobal
import types
@@ -87,7 +87,7 @@ class Messenger:
self.lock.acquire()
try:
objs = []
- for refCount, obj in self._id2object.itervalues():
+ for refCount, obj in self._id2object.values():
objs.append(obj)
return objs
finally:
@@ -97,7 +97,7 @@ class Messenger:
return len(self.__callbacks.get(event, {}))
def _getEvents(self):
- return self.__callbacks.keys()
+ return list(self.__callbacks.keys())
def _releaseObject(self, object):
# assumes lock is held.
@@ -214,7 +214,7 @@ class Messenger:
# Get the list of events this object is listening to
eventDict = self.__objectEvents.get(id)
if eventDict:
- for event in eventDict.keys():
+ for event in list(eventDict.keys()):
# Find the dictionary of all the objects accepting this event
acceptorDict = self.__callbacks.get(event)
# If this object is there, delete it from the dictionary
@@ -240,7 +240,7 @@ class Messenger:
# Get the list of events this object is listening to
eventDict = self.__objectEvents.get(id)
if eventDict:
- return eventDict.keys()
+ return list(eventDict.keys())
return []
finally:
self.lock.release()
@@ -307,7 +307,7 @@ class Messenger:
if not acceptorDict:
if __debug__:
if foundWatch:
- print "Messenger: \"%s\" was sent, but no function in Python listened."%(event,)
+ print("Messenger: \"%s\" was sent, but no function in Python listened."%(event,))
return
if taskChain:
@@ -357,7 +357,7 @@ class Messenger:
return task.done
def __dispatch(self, acceptorDict, event, sentArgs, foundWatch):
- for id in acceptorDict.keys():
+ for id in list(acceptorDict.keys()):
# We have to make this apparently redundant check, because
# it is possible that one object removes its own hooks
# in response to a handler called by a previous object.
@@ -389,10 +389,10 @@ class Messenger:
if __debug__:
if foundWatch:
- print "Messenger: \"%s\" --> %s%s"%(
+ print("Messenger: \"%s\" --> %s%s"%(
event,
self.__methodRepr(method),
- tuple(extraArgs + sentArgs))
+ tuple(extraArgs + sentArgs)))
#print "Messenger: \"%s\" --> %s%s"%(
# event,
@@ -428,7 +428,7 @@ class Messenger:
return (len(self.__callbacks) == 0)
def getEvents(self):
- return self.__callbacks.keys()
+ return list(self.__callbacks.keys())
def replaceMethod(self, oldMethod, newFunction):
"""
@@ -436,9 +436,9 @@ class Messenger:
you redefine functions with Control-c-Control-v
"""
retFlag = 0
- for entry in self.__callbacks.items():
+ for entry in list(self.__callbacks.items()):
event, objectDict = entry
- for objectEntry in objectDict.items():
+ for objectEntry in list(objectDict.items()):
object, params = objectEntry
method = params[0]
if (type(method) == types.MethodType):
@@ -462,8 +462,8 @@ class Messenger:
isVerbose = 1 - Messenger.notify.getDebug()
Messenger.notify.setDebug(isVerbose)
if isVerbose:
- print "Verbose mode true. quiet list = %s"%(
- self.quieting.keys(),)
+ print("Verbose mode true. quiet list = %s"%(
+ list(self.quieting.keys()),))
if __debug__:
def watch(self, needle):
@@ -527,11 +527,11 @@ class Messenger:
return a matching event (needle) if found (in haystack).
This is primarily a debugging tool.
"""
- keys = self.__callbacks.keys()
+ keys = list(self.__callbacks.keys())
keys.sort()
for event in keys:
if repr(event).find(needle) >= 0:
- print self.__eventRepr(event),
+ print(self.__eventRepr(event))
return {event: self.__callbacks[event]}
def findAll(self, needle, limit=None):
@@ -541,11 +541,11 @@ class Messenger:
This is primarily a debugging tool.
"""
matches = {}
- keys = self.__callbacks.keys()
+ keys = list(self.__callbacks.keys())
keys.sort()
for event in keys:
if repr(event).find(needle) >= 0:
- print self.__eventRepr(event),
+ print(self.__eventRepr(event))
matches[event] = self.__callbacks[event]
# if the limit is not None, decrement and
# check for break:
@@ -575,7 +575,7 @@ class Messenger:
"""
str = event.ljust(32) + '\t'
acceptorDict = self.__callbacks[event]
- for key, (method, extraArgs, persistent) in acceptorDict.items():
+ for key, (method, extraArgs, persistent) in list(acceptorDict.items()):
str = str + self.__methodRepr(method) + ' '
str = str + '\n'
return str
@@ -585,16 +585,16 @@ class Messenger:
Compact version of event, acceptor pairs
"""
str = "The messenger is currently handling:\n" + "="*64 + "\n"
- keys = self.__callbacks.keys()
+ keys = list(self.__callbacks.keys())
keys.sort()
for event in keys:
str += self.__eventRepr(event)
# Print out the object: event dictionary too
str += "="*64 + "\n"
- for key, eventDict in self.__objectEvents.items():
+ for key, eventDict in list(self.__objectEvents.items()):
object = self._getObject(key)
str += "%s:\n" % repr(object)
- for event in eventDict.keys():
+ for event in list(eventDict.keys()):
str += " %s\n" % repr(event)
str += "="*64 + "\n" + "End of messenger info.\n"
@@ -607,12 +607,12 @@ class Messenger:
import types
str = 'Messenger\n'
str = str + '='*50 + '\n'
- keys = self.__callbacks.keys()
+ keys = list(self.__callbacks.keys())
keys.sort()
for event in keys:
acceptorDict = self.__callbacks[event]
str = str + 'Event: ' + event + '\n'
- for key in acceptorDict.keys():
+ for key in list(acceptorDict.keys()):
function, extraArgs, persistent = acceptorDict[key]
object = self._getObject(key)
if (type(object) == types.InstanceType):
diff --git a/direct/src/showbase/MessengerGlobal.py b/direct/src/showbase/MessengerGlobal.py
index 38ef00539d..f5a534c0d1 100644
--- a/direct/src/showbase/MessengerGlobal.py
+++ b/direct/src/showbase/MessengerGlobal.py
@@ -2,6 +2,6 @@
__all__ = ['messenger']
-import Messenger
+from . import Messenger
messenger = Messenger.Messenger()
diff --git a/direct/src/showbase/MessengerLeakDetector.py b/direct/src/showbase/MessengerLeakDetector.py
index 50ac0c2a8c..08cbe0778f 100755
--- a/direct/src/showbase/MessengerLeakDetector.py
+++ b/direct/src/showbase/MessengerLeakDetector.py
@@ -1,7 +1,13 @@
from direct.directnotify.DirectNotifyGlobal import directNotify
from direct.showbase.DirectObject import DirectObject
from direct.showbase.Job import Job
-import gc, __builtin__
+import gc, sys
+
+if sys.version_info >= (3, 0):
+ import builtins
+else:
+ import __builtin__ as builtins
+
class MessengerLeakObject(DirectObject):
def __init__(self):
@@ -27,7 +33,7 @@ class MessengerLeakDetector(Job):
# if an object is attached to one of these, it's attached to builtin
# this cuts down on the amount of searching that needs to be done
builtinIds = set()
- builtinIds.add(id(__builtin__.__dict__))
+ builtinIds.add(id(builtins.__dict__))
try:
builtinIds.add(id(base))
builtinIds.add(id(base.cr))
@@ -49,7 +55,7 @@ class MessengerLeakDetector(Job):
while True:
yield None
- objects = messenger._Messenger__objectEvents.keys()
+ objects = list(messenger._Messenger__objectEvents.keys())
assert self.notify.debug('%s objects in the messenger' % len(objects))
for object in objects:
yield None
diff --git a/direct/src/showbase/ObjectPool.py b/direct/src/showbase/ObjectPool.py
index 506a7e2ba5..4b0c0a0731 100755
--- a/direct/src/showbase/ObjectPool.py
+++ b/direct/src/showbase/ObjectPool.py
@@ -12,14 +12,14 @@ class Diff:
self.lost=lost
self.gained=gained
def printOut(self, full=False):
- print 'lost %s objects, gained %s objects' % (len(self.lost), len(self.gained))
- print '\n\nself.lost\n'
- print self.lost.typeFreqStr()
- print '\n\nself.gained\n'
- print self.gained.typeFreqStr()
+ print('lost %s objects, gained %s objects' % (len(self.lost), len(self.gained)))
+ print('\n\nself.lost\n')
+ print(self.lost.typeFreqStr())
+ print('\n\nself.gained\n')
+ print(self.gained.typeFreqStr())
if full:
self.gained.printObjsByType()
- print '\n\nGAINED-OBJECT REFERRERS\n'
+ print('\n\nGAINED-OBJECT REFERRERS\n')
self.gained.printReferrers(1)
class ObjectPool:
@@ -53,14 +53,14 @@ class ObjectPool:
del self._count2types
def getTypes(self):
- return self._type2objs.keys()
+ return list(self._type2objs.keys())
def getObjsOfType(self, type):
return self._type2objs.get(type, [])
def printObjsOfType(self, type):
for obj in self._type2objs.get(type, []):
- print repr(obj)
+ print(repr(obj))
def diff(self, other):
"""print difference between this pool and 'other' pool"""
@@ -97,8 +97,8 @@ class ObjectPool:
return s
def printObjsByType(self):
- print 'Object Pool: Objects By Type'
- print '\n============================'
+ print('Object Pool: Objects By Type')
+ print('\n============================')
counts = list(set(self._count2types.keys()))
counts.sort()
# print types with the smallest number of instances first, in case
@@ -107,8 +107,8 @@ class ObjectPool:
for count in counts:
types = makeList(self._count2types[count])
for typ in types:
- print 'TYPE: %s, %s objects' % (repr(typ), len(self._type2objs[typ]))
- print getNumberedTypedSortedString(self._type2objs[typ])
+ print('TYPE: %s, %s objects' % (repr(typ), len(self._type2objs[typ])))
+ print(getNumberedTypedSortedString(self._type2objs[typ]))
def containerLenStr(self):
s = 'Object Pool: Container Lengths'
@@ -127,17 +127,17 @@ class ObjectPool:
for count in counts:
types = makeList(self._count2types[count])
for typ in types:
- print '\n\nTYPE: %s' % repr(typ)
- for i in xrange(min(numEach,len(self._type2objs[typ]))):
+ print('\n\nTYPE: %s' % repr(typ))
+ for i in range(min(numEach, len(self._type2objs[typ]))):
obj = self._type2objs[typ][i]
- print '\nOBJ: %s\n' % safeRepr(obj)
+ print('\nOBJ: %s\n' % safeRepr(obj))
referrers = gc.get_referrers(obj)
- print '%s REFERRERS:\n' % len(referrers)
+ print('%s REFERRERS:\n' % len(referrers))
if len(referrers):
- print getNumberedTypedString(referrers, maxLen=80,
- numPrefix='REF')
+ print(getNumberedTypedString(referrers, maxLen=80,
+ numPrefix='REF'))
else:
- print ''
+ print('')
def __len__(self):
return len(self._objs)
diff --git a/direct/src/showbase/ObjectReport.py b/direct/src/showbase/ObjectReport.py
index 084557f4b1..b860932d2d 100755
--- a/direct/src/showbase/ObjectReport.py
+++ b/direct/src/showbase/ObjectReport.py
@@ -7,7 +7,11 @@ from direct.showbase import DirectObject, ObjectPool, GarbageReport
from direct.showbase.PythonUtil import makeList, Sync
import gc
import sys
-import __builtin__
+
+if sys.version_info >= (3, 0):
+ import builtins
+else:
+ import __builtin__ as builtins
"""
>>> from direct.showbase import ObjectReport
@@ -134,7 +138,7 @@ class ObjectReport:
gc_objects = gc.get_objects()
# use get_referents to find everything else
objects = gc_objects
- objects.append(__builtin__.__dict__)
+ objects.append(builtins.__dict__)
nextObjList = gc_objects
found = set()
found.add(id(objects))
@@ -160,7 +164,7 @@ class ObjectReport:
else:
objs = []
stateStack = Stack()
- root = __builtins__
+ root = builtins
objIds = set([id(root)])
stateStack.push((root, None, 0))
while True:
@@ -183,7 +187,7 @@ class ObjectReport:
adjacents = newObjs
if len(adjacents) == 0:
print 'DEAD END'
- for i in xrange(resumeIndex, len(adjacents)):
+ for i in range(resumeIndex, len(adjacents)):
adj = adjacents[i]
stateStack.push((obj, adjacents, i+1))
stateStack.push((adj, None, 0))
diff --git a/direct/src/showbase/OnScreenDebug.py b/direct/src/showbase/OnScreenDebug.py
index 7dd70a2912..ba24b0637a 100755
--- a/direct/src/showbase/OnScreenDebug.py
+++ b/direct/src/showbase/OnScreenDebug.py
@@ -4,7 +4,6 @@ __all__ = ['OnScreenDebug']
from panda3d.core import *
-import types
from direct.gui import OnscreenText
from direct.directtools import DirectUtil
@@ -36,7 +35,7 @@ class OnScreenDebug:
font = loader.loadFont(fontPath)
if not font.isValid():
- print "failed to load OnScreenDebug font", fontPath
+ print("failed to load OnScreenDebug font %s" % fontPath)
font = TextNode.getDefaultFont()
self.onScreenText = OnscreenText.OnscreenText(
pos = (-1.0, 0.9), fg=fgColor, bg=bgColor,
@@ -51,7 +50,7 @@ class OnScreenDebug:
if not self.onScreenText:
self.load()
self.onScreenText.clearText()
- entries = self.data.items()
+ entries = list(self.data.items())
entries.sort()
for k, v in entries:
if v[0] == self.frame:
@@ -64,7 +63,7 @@ class OnScreenDebug:
#isNew = "was"
isNew = "~"
value = v[1]
- if type(value) == types.FloatType:
+ if type(value) == float:
value = "% 10.4f"%(value,)
# else: other types will be converted to str by the "%s"
self.onScreenText.appendText("%20s %s %-44s\n"%(k, isNew, value))
@@ -88,7 +87,7 @@ class OnScreenDebug:
def removeAllWithPrefix(self, prefix):
toRemove = []
- for key in self.data.keys():
+ for key in list(self.data.keys()):
if len(key) >= len(prefix):
if key[:len(prefix)] == prefix:
toRemove.append(key)
diff --git a/direct/src/showbase/PhasedObject.py b/direct/src/showbase/PhasedObject.py
index 43c43c4b53..4a6dad1481 100755
--- a/direct/src/showbase/PhasedObject.py
+++ b/direct/src/showbase/PhasedObject.py
@@ -37,7 +37,7 @@ class PhasedObject:
self.aliasPhaseMap = {}
self.__phasing = False
- for alias,phase in aliasMap.items():
+ for alias,phase in list(aliasMap.items()):
self.setAlias(phase, alias)
def __repr__(self):
@@ -168,26 +168,26 @@ if __debug__:
self.setPhase('Away')
def loadPhaseAway(self):
- print 'loading Away'
+ print('loading Away')
def unloadPhaseAway(self):
- print 'unloading Away'
+ print('unloading Away')
def loadPhaseFar(self):
- print 'loading Far'
+ print('loading Far')
def unloadPhaseFar(self):
- print 'unloading Far'
+ print('unloading Far')
def loadPhaseNear(self):
- print 'loading Near'
+ print('loading Near')
def unloadPhaseNear(self):
- print 'unloading Near'
+ print('unloading Near')
def loadPhaseAt(self):
- print 'loading At'
+ print('loading At')
def unloadPhaseAt(self):
- print 'unloading At'
+ print('unloading At')
diff --git a/direct/src/showbase/ProfileSession.py b/direct/src/showbase/ProfileSession.py
index 0d7c7bd8c2..3470f0dc9e 100755
--- a/direct/src/showbase/ProfileSession.py
+++ b/direct/src/showbase/ProfileSession.py
@@ -1,11 +1,18 @@
+from __future__ import print_function
from panda3d.core import TrueClock
from direct.directnotify.DirectNotifyGlobal import directNotify
from direct.showbase.PythonUtil import (
StdoutCapture, _installProfileCustomFuncs,_removeProfileCustomFuncs,
_getProfileResultFileInfo, _setProfileResultsFileInfo)
-import __builtin__
import profile
import pstats
+import sys
+
+if sys.version_info >= (3, 0):
+ import builtins
+else:
+ import __builtin__ as builtins
+
class PercentStats(pstats.Stats):
# prints more useful output when sampled durations are shorter than a millisecond
@@ -22,27 +29,27 @@ class PercentStats(pstats.Stats):
def print_stats(self, *amount):
for filename in self.files:
- print filename
- if self.files: print
+ print(filename)
+ if self.files: print()
indent = ' ' * 8
for func in self.top_level:
- print indent, func_get_function_name(func)
+ print(indent, func_get_function_name(func))
- print indent, self.total_calls, "function calls",
+ print(indent, self.total_calls, "function calls", end=' ')
if self.total_calls != self.prim_calls:
- print "(%d primitive calls)" % self.prim_calls,
+ print("(%d primitive calls)" % self.prim_calls, end=' ')
# DCR
#print "in %.3f CPU seconds" % self.total_tt
- print "in %s CPU milliseconds" % (self.total_tt * 1000.)
+ print("in %s CPU milliseconds" % (self.total_tt * 1000.))
if self._totalTime != self.total_tt:
- print indent, 'percentages are of %s CPU milliseconds' % (self._totalTime * 1000)
- print
+ print(indent, 'percentages are of %s CPU milliseconds' % (self._totalTime * 1000))
+ print()
width, list = self.get_print_list(amount)
if list:
self.print_title()
for func in list:
self.print_line(func)
- print
+ print()
# DCR
#print
return self
@@ -64,20 +71,20 @@ class PercentStats(pstats.Stats):
f8 = self.f8
if nc != cc:
c = c + '/' + str(cc)
- print c.rjust(9),
- print f8(tt),
+ print(c.rjust(9), end=' ')
+ print(f8(tt), end=' ')
if nc == 0:
- print ' '*8,
+ print(' '*8, end=' ')
else:
- print f8(tt/nc),
- print f8(ct),
+ print(f8(tt/nc), end=' ')
+ print(f8(ct), end=' ')
if cc == 0:
- print ' '*8,
+ print(' '*8, end=' ')
else:
- print f8(ct/cc),
+ print(f8(ct/cc), end=' ')
# DCR
#print func_std_string(func)
- print PercentStats.func_std_string(func)
+ print(PercentStats.func_std_string(func))
class ProfileSession:
# class that encapsulates a profile of a single callable using Python's standard
@@ -155,7 +162,7 @@ class ProfileSession:
self._reset()
# if we're already profiling, just run the func and don't profile
- if 'globalProfileSessionFunc' in __builtin__.__dict__:
+ if 'globalProfileSessionFunc' in builtins.__dict__:
self.notify.warning('could not profile %s' % self._func)
result = self._func()
if self._duration is None:
@@ -163,8 +170,8 @@ class ProfileSession:
else:
# put the function in the global namespace so that profile can find it
assert hasattr(self._func, '__call__')
- __builtin__.globalProfileSessionFunc = self._func
- __builtin__.globalProfileSessionResult = [None]
+ builtins.globalProfileSessionFunc = self._func
+ builtins.globalProfileSessionResult = [None]
# set up the RAM file
self._filenames.append(self._getNextFilename())
@@ -197,7 +204,7 @@ class ProfileSession:
# calculate the duration (this is dependent on the internal Python profile data format.
# see profile.py and pstats.py, this was copied from pstats.Stats.strip_dirs)
maxTime = 0.
- for cc, nc, tt, ct, callers in profData[1].itervalues():
+ for cc, nc, tt, ct, callers in profData[1].values():
if ct > maxTime:
maxTime = ct
self._duration = maxTime
@@ -206,8 +213,8 @@ class ProfileSession:
# clean up the globals
result = globalProfileSessionResult[0]
- del __builtin__.__dict__['globalProfileSessionFunc']
- del __builtin__.__dict__['globalProfileSessionResult']
+ del builtins.__dict__['globalProfileSessionFunc']
+ del builtins.__dict__['globalProfileSessionResult']
self._successfulProfiles += 1
diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py
index e1750cf21f..c433384859 100644
--- a/direct/src/showbase/PythonUtil.py
+++ b/direct/src/showbase/PythonUtil.py
@@ -11,7 +11,7 @@ __all__ = ['indent',
'boolEqual', 'lineupPos', 'formatElapsedSeconds', 'solveQuadratic',
'findPythonModule', 'mostDerivedLast',
'weightedChoice', 'randFloat', 'normalDistrib',
-'weightedRand', 'randUint31', 'randInt32', 'randUint32',
+'weightedRand', 'randUint31', 'randInt32',
'SerialNumGen', 'serialNum', 'uniqueName', 'Enum', 'Singleton',
'SingletonError', 'printListEnum', 'safeRepr',
'fastRepr', 'isDefaultValue',
@@ -33,19 +33,24 @@ if __debug__:
'getProfileResultString', 'printStack', 'printReverseStack']
import types
-import string
import math
import os
import sys
import random
import time
-import __builtin__
import importlib
__report_indent = 3
from panda3d.core import ConfigVariableBool
+if sys.version_info >= (3, 0):
+ import builtins
+ xrange = range
+else:
+ import __builtin__ as builtins
+
+
"""
# with one integer positional arg, this uses about 4/5 of the memory of the Functor class below
def Functor(function, *args, **kArgs):
@@ -93,7 +98,7 @@ class Functor:
except:
argStr = 'bad repr: %s' % arg.__class__
s += ', %s' % argStr
- for karg, value in self._kargs.items():
+ for karg, value in list(self._kargs.items()):
s += ', %s=%s' % (karg, repr(value))
s += ')'
return s
@@ -220,13 +225,13 @@ if __debug__:
return r
def printStack():
- print StackTrace(start=1).compact()
+ print(StackTrace(start=1).compact())
return True
def printReverseStack():
- print StackTrace(start=1).reverseCompact()
+ print(StackTrace(start=1).reverseCompact())
return True
def printVerboseStack():
- print StackTrace(start=1)
+ print(StackTrace(start=1))
return True
#-----------------------------------------------------------------------------
@@ -273,7 +278,7 @@ if __debug__:
return traceFunctionCall(sys._getframe(2))
def printThisCall():
- print traceFunctionCall(sys._getframe(1))
+ print(traceFunctionCall(sys._getframe(1)))
return 1 # to allow "assert printThisCall()"
# Magic numbers: These are the bit masks in func_code.co_flags that
@@ -284,7 +289,7 @@ _KEY_DICT = 8
def doc(obj):
if (isinstance(obj, types.MethodType)) or \
(isinstance(obj, types.FunctionType)):
- print obj.__doc__
+ print(obj.__doc__)
def adjust(command = None, dim = 1, parent = None, **kw):
"""
@@ -312,15 +317,15 @@ def adjust(command = None, dim = 1, parent = None, **kw):
Valuator = importlib.import_module('direct.tkwidgets.Valuator')
# Set command if specified
if command:
- kw['command'] = lambda x: apply(command, x)
+ kw['command'] = lambda x: command(*x)
if parent is None:
kw['title'] = command.__name__
kw['dim'] = dim
# Create toplevel if needed
if not parent:
- vg = apply(Valuator.ValuatorGroupPanel, (parent,), kw)
+ vg = Valuator.ValuatorGroupPanel(parent, **kw)
else:
- vg = apply(Valuator.ValuatorGroup, (parent,), kw)
+ vg = Valuator.ValuatorGroup(parent, **kw)
vg.pack(expand = 1, fill = 'x')
return vg
@@ -378,18 +383,18 @@ def sameElements(a, b):
def makeList(x):
"""returns x, converted to a list"""
- if type(x) is types.ListType:
+ if type(x) is list:
return x
- elif type(x) is types.TupleType:
+ elif type(x) is tuple:
return list(x)
else:
return [x,]
def makeTuple(x):
"""returns x, converted to a tuple"""
- if type(x) is types.ListType:
+ if type(x) is list:
return tuple(x)
- elif type(x) is types.TupleType:
+ elif type(x) is tuple:
return x
else:
return (x,)
@@ -429,7 +434,7 @@ def invertDict(D, lossy=False):
n = {}
for key, value in D.items():
if not lossy and value in n:
- raise 'duplicate key in invertDict: %s' % value
+ raise Exception('duplicate key in invertDict: %s' % value)
n[value] = key
return n
@@ -587,7 +592,7 @@ class StdoutPassthrough(StdoutCapture):
# constant profile defaults
if __debug__:
- from StringIO import StringIO
+ from io import StringIO
PyUtilProfileDefaultFilename = 'profiledata'
PyUtilProfileDefaultLines = 80
@@ -604,29 +609,29 @@ if __debug__:
def profileFunc(callback, name, terse, log=True):
global _ProfileResultStr
- if 'globalProfileFunc' in __builtin__.__dict__:
+ if 'globalProfileFunc' in builtins.__dict__:
# rats. Python profiler is not re-entrant...
base.notify.warning(
'PythonUtil.profileStart(%s): aborted, already profiling %s'
#'\nStack Trace:\n%s'
- % (name, __builtin__.globalProfileFunc,
+ % (name, builtins.globalProfileFunc,
#StackTrace()
))
return
- __builtin__.globalProfileFunc = callback
- __builtin__.globalProfileResult = [None]
+ builtins.globalProfileFunc = callback
+ builtins.globalProfileResult = [None]
prefix = '***** START PROFILE: %s *****' % name
if log:
- print prefix
+ print(prefix)
startProfile(cmd='globalProfileResult[0]=globalProfileFunc()', callInfo=(not terse), silent=not log)
suffix = '***** END PROFILE: %s *****' % name
if log:
- print suffix
+ print(suffix)
else:
_ProfileResultStr = '%s\n%s\n%s' % (prefix, _ProfileResultStr, suffix)
result = globalProfileResult[0]
- del __builtin__.__dict__['globalProfileFunc']
- del __builtin__.__dict__['globalProfileResult']
+ del builtins.__dict__['globalProfileFunc']
+ del builtins.__dict__['globalProfileResult']
return result
def profiled(category=None, terse=False):
@@ -641,7 +646,7 @@ if __debug__:
want-profile-particles 1
"""
- assert type(category) in (types.StringType, types.NoneType), "must provide a category name for @profiled"
+ assert type(category) in (str, type(None)), "must provide a category name for @profiled"
# allow profiling in published versions
"""
@@ -720,8 +725,8 @@ if __debug__:
assert filename not in profileFilenames
profileFilenames.add(filename)
profileFilenameList.push(filename)
- movedOpenFuncs.append(__builtin__.open)
- __builtin__.open = _profileOpen
+ movedOpenFuncs.append(builtins.open)
+ builtins.open = _profileOpen
movedDumpFuncs.append(marshal.dump)
marshal.dump = _profileMarshalDump
movedLoadFuncs.append(marshal.load)
@@ -746,7 +751,7 @@ if __debug__:
assert profileFilenameList.top() == filename
marshal.load = movedLoadFuncs.pop()
marshal.dump = movedDumpFuncs.pop()
- __builtin__.open = movedOpenFuncs.pop()
+ builtins.open = movedOpenFuncs.pop()
profileFilenames.remove(filename)
profileFilenameList.pop()
profileFilename2file.pop(filename, None)
@@ -763,10 +768,10 @@ if __debug__:
#
# def func(self=self):
# self.load()
- # import __builtin__
- # __builtin__.func = func
+ # import builtins
+ # builtins.func = func
# PythonUtil.startProfile(cmd='func()', filename='profileData')
- # del __builtin__.func
+ # del builtins.func
#
def _profileWithoutGarbageLeak(cmd, filename):
# The profile module isn't necessarily installed on every Python
@@ -1162,8 +1167,8 @@ def weightedRand(valDict, rng=random.random):
-Weights need not add up to any particular value.
-The actual selection will be returned.
"""
- selections = valDict.keys()
- weights = valDict.values()
+ selections = list(valDict.keys())
+ weights = list(valDict.values())
totalWeight = 0
for weight in weights:
@@ -1195,11 +1200,6 @@ def randInt32(rng=random.random):
i *= -1
return i
-def randUint32(rng=random.random):
- """returns a random integer in [0..2^32).
- rng must return float in [0..1]"""
- return long(rng() * 0xFFFFFFFFL)
-
class SerialNumGen:
"""generates serial numbers"""
def __init__(self, start=None):
@@ -1228,15 +1228,16 @@ def uniqueName(name):
class EnumIter:
def __init__(self, enum):
- self._values = enum._stringTable.keys()
+ self._values = list(enum._stringTable.keys())
self._index = 0
def __iter__(self):
return self
- def next(self):
+ def __next__(self):
if self._index >= len(self._values):
raise StopIteration
self._index += 1
return self._values[self._index-1]
+ next = __next__
class Enum:
"""Pass in list of strings or string of comma-separated strings.
@@ -1258,6 +1259,8 @@ class Enum:
"""
if __debug__:
+ import string
+
# chars that cannot appear within an item string.
InvalidChars = string.whitespace
def _checkValidIdentifier(item):
@@ -1389,7 +1392,7 @@ def printListEnumGen(l):
n //= 10
format = '%0' + '%s' % digits + 'i:%s'
for i in range(len(l)):
- print format % (i, l[i])
+ print(format % (i, l[i]))
yield None
def printListEnum(l):
@@ -1461,10 +1464,10 @@ def fastRepr(obj, maxLen=200, strFactor=10, _visitedIds=None):
_visitedIds = set()
if id(obj) in _visitedIds:
return '' % itype(obj)
- if type(obj) in (types.TupleType, types.ListType):
+ if type(obj) in (tuple, list):
s = ''
- s += {types.TupleType: '(',
- types.ListType: '[',}[type(obj)]
+ s += {tuple: '(',
+ list: '[',}[type(obj)]
if maxLen is not None and len(obj) > maxLen:
o = obj[:maxLen]
ellips = '...'
@@ -1477,16 +1480,16 @@ def fastRepr(obj, maxLen=200, strFactor=10, _visitedIds=None):
s += ', '
_visitedIds.remove(id(obj))
s += ellips
- s += {types.TupleType: ')',
- types.ListType: ']',}[type(obj)]
+ s += {tuple: ')',
+ list: ']',}[type(obj)]
return s
- elif type(obj) is types.DictType:
+ elif type(obj) is dict:
s = '{'
if maxLen is not None and len(obj) > maxLen:
- o = obj.keys()[:maxLen]
+ o = list(obj.keys())[:maxLen]
ellips = '...'
else:
- o = obj.keys()
+ o = list(obj.keys())
ellips = ''
_visitedIds.add(id(obj))
for key in o:
@@ -1497,7 +1500,7 @@ def fastRepr(obj, maxLen=200, strFactor=10, _visitedIds=None):
s += ellips
s += '}'
return s
- elif type(obj) is types.StringType:
+ elif type(obj) is str:
if maxLen is not None:
maxLen *= strFactor
if maxLen is not None and len(obj) > maxLen:
@@ -1515,14 +1518,14 @@ def fastRepr(obj, maxLen=200, strFactor=10, _visitedIds=None):
def convertTree(objTree, idList):
newTree = {}
- for key in objTree.keys():
+ for key in list(objTree.keys()):
obj = (idList[key],)
newTree[obj] = {}
r_convertTree(objTree[key], newTree[obj], idList)
return newTree
def r_convertTree(oldTree, newTree, idList):
- for key in oldTree.keys():
+ for key in list(oldTree.keys()):
obj = idList.get(key)
if(not obj):
@@ -1535,14 +1538,14 @@ def r_convertTree(oldTree, newTree, idList):
def pretty_print(tree):
for name in tree.keys():
- print name
+ print(name)
r_pretty_print(tree[name], 0)
def r_pretty_print(tree, num):
num+=1
for name in tree.keys():
- print " "*num,name
+ print(" "*num,name)
r_pretty_print(tree[name],num)
@@ -1568,13 +1571,13 @@ def appendStr(obj, st):
class ScratchPad:
"""empty class to stick values onto"""
def __init__(self, **kArgs):
- for key, value in kArgs.iteritems():
+ for key, value in kArgs.items():
setattr(self, key, value)
self._keys = set(kArgs.keys())
def add(self, **kArgs):
- for key, value in kArgs.iteritems():
+ for key, value in kArgs.items():
setattr(self, key, value)
- self._keys.update(kArgs.keys())
+ self._keys.update(list(kArgs.keys()))
def destroy(self):
for key in self._keys:
delattr(self, key)
@@ -1639,10 +1642,10 @@ def deeptype(obj, maxLen=100, _visitedIds=None):
if id(obj) in _visitedIds:
return '' % itype(obj)
t = type(obj)
- if t in (types.TupleType, types.ListType):
+ if t in (tuple, list):
s = ''
- s += {types.TupleType: '(',
- types.ListType: '[',}[type(obj)]
+ s += {tuple: '(',
+ list: '[',}[type(obj)]
if maxLen is not None and len(obj) > maxLen:
o = obj[:maxLen]
ellips = '...'
@@ -1655,16 +1658,16 @@ def deeptype(obj, maxLen=100, _visitedIds=None):
s += ', '
_visitedIds.remove(id(obj))
s += ellips
- s += {types.TupleType: ')',
- types.ListType: ']',}[type(obj)]
+ s += {tuple: ')',
+ list: ']',}[type(obj)]
return s
- elif type(obj) is types.DictType:
+ elif type(obj) is dict:
s = '{'
if maxLen is not None and len(obj) > maxLen:
- o = obj.keys()[:maxLen]
+ o = list(obj.keys())[:maxLen]
ellips = '...'
else:
- o = obj.keys()
+ o = list(obj.keys())
ellips = ''
_visitedIds.add(id(obj))
for key in o:
@@ -1745,7 +1748,7 @@ def printNumberedTyped(items, maxLen=5000):
if len(objStr) > maxLen:
snip = ''
objStr = '%s%s' % (objStr[:(maxLen-len(snip))], snip)
- print format % (i, itype(items[i]), objStr)
+ print(format % (i, itype(items[i]), objStr))
def printNumberedTypesGen(items, maxLen=5000):
digits = 0
@@ -1756,7 +1759,7 @@ def printNumberedTypesGen(items, maxLen=5000):
digits = digits
format = '%0' + '%s' % digits + 'i:%s'
for i in xrange(len(items)):
- print format % (i, itype(items[i]))
+ print(format % (i, itype(items[i])))
yield None
def printNumberedTypes(items, maxLen=5000):
@@ -2048,7 +2051,7 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
pass
pass
- except NameError,e:
+ except NameError as e:
return decorator
globalClockDelta = importlib.import_module("direct.distributed.ClockDelta").globalClockDelta
@@ -2101,18 +2104,18 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
if notifyFunc:
notifyFunc(outStr % (prefix,))
else:
- print indent(outStr % (prefix,))
+ print(indent(outStr % (prefix,)))
else:
if notifyFunc:
notifyFunc(outStr)
else:
- print indent(outStr)
+ print(indent(outStr))
if 'interests' in types:
base.cr.printInterestSets()
if 'stackTrace' in types:
- print StackTrace()
+ print(StackTrace())
global __report_indent
rVal = None
@@ -2122,7 +2125,7 @@ def report(types = [], prefix = '', xform = None, notifyFunc = None, dConfigPara
finally:
__report_indent -= 1
if rVal is not None:
- print indent(' -> '+repr(rVal))
+ print(indent(' -> '+repr(rVal)))
pass
pass
return rVal
@@ -2177,12 +2180,12 @@ if __debug__:
def _exceptionLogged(*args, **kArgs):
try:
return f(*args, **kArgs)
- except Exception, e:
+ except Exception as e:
try:
s = '%s(' % f.__name__
for arg in args:
s += '%s, ' % arg
- for key, value in kArgs.items():
+ for key, value in list(kArgs.items()):
s += '%s=%s, ' % (key, value)
if len(args) or len(kArgs):
s = s[:-2]
@@ -2235,7 +2238,7 @@ def makeFlywheelGen(objects, countList=None, countFunc=None, scale=None):
def flywheel(index2objectAndCount):
# generator to produce a sequence whose elements appear a specific number of times
while len(index2objectAndCount):
- keyList = index2objectAndCount.keys()
+ keyList = list(index2objectAndCount.keys())
for key in keyList:
if index2objectAndCount[key][1] > 0:
yield index2objectAndCount[key][0]
@@ -2322,7 +2325,7 @@ if __debug__:
st=globalClock.getRealTime()
f(*args,**kArgs)
s=globalClock.getRealTime()-st
- print "Function %s.%s took %s seconds"%(f.__module__, f.__name__,s)
+ print("Function %s.%s took %s seconds"%(f.__module__, f.__name__,s))
else:
import profile as prof, pstats
@@ -2355,7 +2358,7 @@ def getTotalAnnounceTime():
def getAnnounceGenerateTime(stat):
val=0
stats=stat.stats
- for i in stats.keys():
+ for i in list(stats.keys()):
if(i[2]=="announceGenerate"):
newVal=stats[i][3]
if(newVal>val):
@@ -2418,9 +2421,9 @@ class MiniLogSentry:
del self.log
def logBlock(id, msg):
- print '<< LOGBLOCK(%03d)' % id
- print str(msg)
- print '/LOGBLOCK(%03d) >>' % id
+ print('<< LOGBLOCK(%03d)' % id)
+ print(str(msg))
+ print('/LOGBLOCK(%03d) >>' % id)
class HierarchyException(Exception):
JOSWILSO = 0
@@ -2592,9 +2595,6 @@ def endSuperLog():
superLogFile.close()
superLogFile = None
-def isInteger(n):
- return type(n) in (types.IntType, types.LongType)
-
def configIsToday(configName):
# TODO: replace usage of strptime with something else
# returns true if config string is a valid representation of today's date
@@ -2660,68 +2660,53 @@ if __debug__ and __name__ == '__main__':
assert unescapeHtmlString('as%32df') == 'as2df'
assert unescapeHtmlString('asdf%32') == 'asdf2'
-def unicodeUtf8(s):
- # * -> Unicode UTF-8
- if type(s) is types.UnicodeType:
- return s
- else:
- return unicode(str(s), 'utf-8')
-
-def encodedUtf8(s):
- # * -> 8-bit-encoded UTF-8
- return unicodeUtf8(s).encode('utf-8')
-
-import __builtin__
-__builtin__.Functor = Functor
-__builtin__.Stack = Stack
-__builtin__.Queue = Queue
-__builtin__.Enum = Enum
-__builtin__.SerialNumGen = SerialNumGen
-__builtin__.SerialMaskedGen = SerialMaskedGen
-__builtin__.ScratchPad = ScratchPad
-__builtin__.uniqueName = uniqueName
-__builtin__.serialNum = serialNum
+builtins.Functor = Functor
+builtins.Stack = Stack
+builtins.Queue = Queue
+builtins.Enum = Enum
+builtins.SerialNumGen = SerialNumGen
+builtins.SerialMaskedGen = SerialMaskedGen
+builtins.ScratchPad = ScratchPad
+builtins.uniqueName = uniqueName
+builtins.serialNum = serialNum
if __debug__:
- __builtin__.profiled = profiled
- __builtin__.exceptionLogged = exceptionLogged
-__builtin__.itype = itype
-__builtin__.appendStr = appendStr
-__builtin__.bound = bound
-__builtin__.clamp = clamp
-__builtin__.lerp = lerp
-__builtin__.makeList = makeList
-__builtin__.makeTuple = makeTuple
+ builtins.profiled = profiled
+ builtins.exceptionLogged = exceptionLogged
+builtins.itype = itype
+builtins.appendStr = appendStr
+builtins.bound = bound
+builtins.clamp = clamp
+builtins.lerp = lerp
+builtins.makeList = makeList
+builtins.makeTuple = makeTuple
if __debug__:
- __builtin__.printStack = printStack
- __builtin__.printReverseStack = printReverseStack
- __builtin__.printVerboseStack = printVerboseStack
-__builtin__.DelayedCall = DelayedCall
-__builtin__.DelayedFunctor = DelayedFunctor
-__builtin__.FrameDelayedCall = FrameDelayedCall
-__builtin__.SubframeCall = SubframeCall
-__builtin__.invertDict = invertDict
-__builtin__.invertDictLossless = invertDictLossless
-__builtin__.getBase = getBase
-__builtin__.getRepository = getRepository
-__builtin__.safeRepr = safeRepr
-__builtin__.fastRepr = fastRepr
-__builtin__.nullGen = nullGen
-__builtin__.flywheel = flywheel
-__builtin__.loopGen = loopGen
+ builtins.printStack = printStack
+ builtins.printReverseStack = printReverseStack
+ builtins.printVerboseStack = printVerboseStack
+builtins.DelayedCall = DelayedCall
+builtins.DelayedFunctor = DelayedFunctor
+builtins.FrameDelayedCall = FrameDelayedCall
+builtins.SubframeCall = SubframeCall
+builtins.invertDict = invertDict
+builtins.invertDictLossless = invertDictLossless
+builtins.getBase = getBase
+builtins.getRepository = getRepository
+builtins.safeRepr = safeRepr
+builtins.fastRepr = fastRepr
+builtins.nullGen = nullGen
+builtins.flywheel = flywheel
+builtins.loopGen = loopGen
if __debug__:
- __builtin__.StackTrace = StackTrace
-__builtin__.report = report
-__builtin__.pstatcollect = pstatcollect
-__builtin__.MiniLog = MiniLog
-__builtin__.MiniLogSentry = MiniLogSentry
-__builtin__.logBlock = logBlock
-__builtin__.HierarchyException = HierarchyException
-__builtin__.deeptype = deeptype
-__builtin__.Default = Default
-__builtin__.isInteger = isInteger
-__builtin__.configIsToday = configIsToday
-__builtin__.typeName = typeName
-__builtin__.safeTypeName = safeTypeName
-__builtin__.histogramDict = histogramDict
-__builtin__.unicodeUtf8 = unicodeUtf8
-__builtin__.encodedUtf8 = encodedUtf8
+ builtins.StackTrace = StackTrace
+builtins.report = report
+builtins.pstatcollect = pstatcollect
+builtins.MiniLog = MiniLog
+builtins.MiniLogSentry = MiniLogSentry
+builtins.logBlock = logBlock
+builtins.HierarchyException = HierarchyException
+builtins.deeptype = deeptype
+builtins.Default = Default
+builtins.configIsToday = configIsToday
+builtins.typeName = typeName
+builtins.safeTypeName = safeTypeName
+builtins.histogramDict = histogramDict
diff --git a/direct/src/showbase/RandomNumGen.py b/direct/src/showbase/RandomNumGen.py
index da95bbabee..df37f1cd17 100644
--- a/direct/src/showbase/RandomNumGen.py
+++ b/direct/src/showbase/RandomNumGen.py
@@ -23,7 +23,7 @@ class RandomNumGen:
if isinstance(seed, RandomNumGen):
# seed this rng with the other rng
rng = seed
- seed = rng.randint(0, 1L << 16)
+ seed = rng.randint(0, 1 << 16)
self.notify.debug("seed: " + str(seed))
seed = int(seed)
@@ -70,11 +70,7 @@ class RandomNumGen:
assert N >= 0
assert N <= 0x7fffffff
- # the cast to 'long' prevents python from importing warnings.py,
- # presumably to warn that the multiplication result is too
- # large for an int and is implicitly being returned as a long.
- # import of warnings.py was taking a few seconds
- return int((self.__rng.getUint31() * long(N)) >> 31)
+ return int((self.__rng.getUint31() * N) >> 31)
def choice(self, seq):
"""returns a random element from seq"""
@@ -82,7 +78,7 @@ class RandomNumGen:
def shuffle(self, x):
"""randomly shuffles x in-place"""
- for i in xrange(len(x)-1, 0, -1):
+ for i in range(len(x) - 1, 0, -1):
# pick an element in x[:i+1] with which to exchange x[i]
j = int(self.__rand(i+1))
x[i], x[j] = x[j], x[i]
@@ -134,4 +130,4 @@ class RandomNumGen:
# synchronicity is critical
def random(self):
"""returns random float in [0.0, 1.0)"""
- return float(self.__rng.getUint31()) / float(1L << 31)
+ return float(self.__rng.getUint31()) / float(1 << 31)
diff --git a/direct/src/showbase/ReferrerSearch.py b/direct/src/showbase/ReferrerSearch.py
index 06272f5d05..1015c1973b 100755
--- a/direct/src/showbase/ReferrerSearch.py
+++ b/direct/src/showbase/ReferrerSearch.py
@@ -34,7 +34,7 @@ class ReferrerSearch(Job):
self.info = safeReprNotify.getInfo()
safeReprNotify.setInfo(0)
- print 'RefPath(%s): Beginning ReferrerSearch for %s' %(self._id, fastRepr(self.obj))
+ print('RefPath(%s): Beginning ReferrerSearch for %s' %(self._id, fastRepr(self.obj)))
self.visited = set()
for x in self.stepGenerator(0, [self.obj]):
@@ -45,7 +45,7 @@ class ReferrerSearch(Job):
pass
def finished(self):
- print 'RefPath(%s): Finished ReferrerSearch for %s' %(self._id, fastRepr(self.obj))
+ print('RefPath(%s): Finished ReferrerSearch for %s' %(self._id, fastRepr(self.obj)))
self.obj = None
safeReprNotify = _getSafeReprNotify()
@@ -53,7 +53,7 @@ class ReferrerSearch(Job):
pass
def __del__(self):
- print 'ReferrerSearch garbage collected'
+ print('ReferrerSearch garbage collected')
def truncateAtNewLine(self, s):
if s.find('\n') == -1:
@@ -68,13 +68,13 @@ class ReferrerSearch(Job):
def myrepr(self, referrer, refersTo):
pre = ''
if (isinstance(referrer, dict)):
- for k,v in referrer.iteritems():
+ for k,v in referrer.items():
if v is refersTo:
pre = self.truncateAtNewLine(fastRepr(k)) + ']-> '
break
elif (isinstance(referrer, (list, tuple))):
- for x in xrange(len(referrer)):
- if referrer[x] is refersTo:
+ for x, ref in enumerate(referrer):
+ if ref is refersTo:
pre = '%s]-> ' % (x)
break
@@ -114,7 +114,7 @@ class ReferrerSearch(Job):
if not (ref is path or \
inspect.isframe(ref) or \
(isinstance(ref, dict) and \
- ref.keys() == locals().keys()) or \
+ list(ref.keys()) == list(locals().keys())) or \
ref is self.__dict__ or \
id(ref) in self.visited) ]
@@ -163,7 +163,7 @@ class ReferrerSearch(Job):
# The referrer is this call frame
inspect.isframe(ref) or \
# The referrer is the locals() dictionary (closure)
- (isinstance(ref, dict) and ref.keys() == locals().keys()) or \
+ (isinstance(ref, dict) and list(ref.keys()) == list(locals().keys())) or \
# We found the reference on self
ref is self.__dict__ or \
# We've already seen this referrer
@@ -192,8 +192,8 @@ class ReferrerSearch(Job):
def printStats(self, path):
path = list(reversed(path))
path.insert(0,0)
- print 'RefPath(%s) - Stats - visited(%s) | found(%s) | depth(%s) | CurrentPath(%s)' % \
- (self._id, len(self.visited), self.found, self.depth, ''.join(self.myrepr(path[x], path[x+1]) for x in xrange(len(path)-1)))
+ print('RefPath(%s) - Stats - visited(%s) | found(%s) | depth(%s) | CurrentPath(%s)' % \
+ (self._id, len(self.visited), self.found, self.depth, ''.join(self.myrepr(path[x], path[x+1]) for x in range(len(path) - 1))))
pass
def isAtRoot(self, at, path):
@@ -205,10 +205,10 @@ class ReferrerSearch(Job):
sys.stdout.write("RefPath(%s): Circular: " % self._id)
path = list(reversed(path))
path.insert(0,0)
- for x in xrange(len(path)-1):
+ for x in range(len(path) - 1):
sys.stdout.write(self.myrepr(path[x], path[x+1]))
pass
- print
+ print("")
return True
@@ -218,80 +218,80 @@ class ReferrerSearch(Job):
sys.stdout.write("RefPath(%s): __builtins__-> " % self._id)
path = list(reversed(path))
path.insert(0,0)
- for x in xrange(len(path)-1):
+ for x in range(len(path) - 1):
sys.stdout.write(self.myrepr(path[x], path[x+1]))
pass
- print
+ print("")
return True
# any module scope
if inspect.ismodule(at):
sys.stdout.write("RefPath(%s): Module(%s)-> " % (self._id, at.__name__))
path = list(reversed(path))
- for x in xrange(len(path)-1):
+ for x in range(len(path) - 1):
sys.stdout.write(self.myrepr(path[x], path[x+1]))
pass
- print
+ print("")
return True
# any class scope
if inspect.isclass(at):
sys.stdout.write("RefPath(%s): Class(%s)-> " % (self._id, at.__name__))
path = list(reversed(path))
- for x in xrange(len(path)-1):
+ for x in range(len(path) - 1):
sys.stdout.write(self.myrepr(path[x], path[x+1]))
pass
- print
+ print("")
return True
# simbase
if at is simbase:
sys.stdout.write("RefPath(%s): simbase-> " % self._id)
path = list(reversed(path))
- for x in xrange(len(path)-1):
+ for x in range(len(path) - 1):
sys.stdout.write(self.myrepr(path[x], path[x+1]))
pass
- print
+ print("")
return True
# simbase.air
if at is simbase.air:
sys.stdout.write("RefPath(%s): simbase.air-> " % self._id)
path = list(reversed(path))
- for x in xrange(len(path)-1):
+ for x in range(len(path) - 1):
sys.stdout.write(self.myrepr(path[x], path[x+1]))
pass
- print
+ print("")
return True
# messenger
if at is messenger:
sys.stdout.write("RefPath(%s): messenger-> " % self._id)
path = list(reversed(path))
- for x in xrange(len(path)-1):
+ for x in range(len(path) - 1):
sys.stdout.write(self.myrepr(path[x], path[x+1]))
pass
- print
+ print("")
return True
# taskMgr
if at is taskMgr:
sys.stdout.write("RefPath(%s): taskMgr-> " % self._id)
path = list(reversed(path))
- for x in xrange(len(path)-1):
+ for x in range(len(path) - 1):
sys.stdout.write(self.myrepr(path[x], path[x+1]))
pass
- print
+ print("")
return True
# world
if hasattr(simbase.air, 'mainWorld') and at is simbase.air.mainWorld:
sys.stdout.write("RefPath(%s): mainWorld-> " % self._id)
path = list(reversed(path))
- for x in xrange(len(path)-1):
+ for x in range(len(path) - 1):
sys.stdout.write(self.myrepr(path[x], path[x+1]))
pass
- print
+ print("")
return True
pass
@@ -304,14 +304,14 @@ class ReferrerSearch(Job):
sys.stdout.write("RefPath(%s): ManyRefs(%s)[%s]-> " % (self._id, len(referrers), fastRepr(at)))
path = list(reversed(path))
path.insert(0,0)
- for x in xrange(len(path)-1):
+ for x in range(len(path) - 1):
sys.stdout.write(self.myrepr(path[x], path[x+1]))
pass
- print
+ print("")
return True
else:
sys.stdout.write("RefPath(%s): ManyRefsAllowed(%s)[%s]-> " % (self._id, len(referrers), fastRepr(at, maxLen = 1, strFactor = 30)))
- print
+ print("")
pass
pass
return False
diff --git a/direct/src/showbase/ShadowPlacer.py b/direct/src/showbase/ShadowPlacer.py
index b05bc3e8eb..b0563d007c 100755
--- a/direct/src/showbase/ShadowPlacer.py
+++ b/direct/src/showbase/ShadowPlacer.py
@@ -13,7 +13,7 @@ the its parent node.
from direct.controls.ControlManager import CollisionHandlerRayStart
from direct.directnotify import DirectNotifyGlobal
from pandac.PandaModules import *
-import DirectObject
+from . import DirectObject
class ShadowPlacer(DirectObject.DirectObject):
notify = DirectNotifyGlobal.directNotify.newCategory("ShadowPlacer")
diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index f9f8068683..80368ab175 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -17,32 +17,35 @@ from panda3d.direct import storeAccessibilityShortcutKeys, allowAccessibilitySho
from direct.extensions_native import NodePath_extensions
# This needs to be available early for DirectGUI imports
-import __builtin__ as builtins
+import sys
+if sys.version_info >= (3, 0):
+ import builtins
+else:
+ import __builtin__ as builtins
builtins.config = get_config_showbase()
from direct.directnotify.DirectNotifyGlobal import directNotify, giveNotify
-from MessengerGlobal import messenger
-from BulletinBoardGlobal import bulletinBoard
+from .MessengerGlobal import messenger
+from .BulletinBoardGlobal import bulletinBoard
from direct.task.TaskManagerGlobal import taskMgr
-from JobManagerGlobal import jobMgr
-from EventManagerGlobal import eventMgr
+from .JobManagerGlobal import jobMgr
+from .EventManagerGlobal import eventMgr
#from PythonUtil import *
from direct.interval import IntervalManager
from direct.showbase.BufferViewer import BufferViewer
from direct.task import Task
-import sys
-import Loader
+from . import Loader
import time
import atexit
import importlib
from direct.showbase import ExceptionVarDump
-import DirectObject
-import SfxPlayer
+from . import DirectObject
+from . import SfxPlayer
if __debug__:
from direct.showbase import GarbageReport
from direct.directutil import DeltaProfiler
- import OnScreenDebug
-import AppRunnerGlobal
+ from . import OnScreenDebug
+from . import AppRunnerGlobal
def legacyRun():
assert builtins.base.notify.warning("run() is deprecated, use base.run() instead")
@@ -402,7 +405,7 @@ class ShowBase(DirectObject.DirectObject):
self.accept('window-event', self.windowEvent)
# Transition effects (fade, iris, etc)
- import Transitions
+ from . import Transitions
self.transitions = Transitions.Transitions(self.loader)
if self.win:
@@ -478,12 +481,12 @@ class ShowBase(DirectObject.DirectObject):
add stuff to this.
"""
if self.config.GetBool('want-env-debug-info', 0):
- print "\n\nEnvironment Debug Info {"
- print "* model path:"
- print getModelPath()
+ print("\n\nEnvironment Debug Info {")
+ print("* model path:")
+ print(getModelPath())
#print "* dna path:"
#print getDnaPath()
- print "}"
+ print("}")
def destroy(self):
""" Call this function to destroy the ShowBase and stop all
diff --git a/direct/src/showbase/ShowBaseGlobal.py b/direct/src/showbase/ShowBaseGlobal.py
index 451f411f15..0781b06f0e 100644
--- a/direct/src/showbase/ShowBaseGlobal.py
+++ b/direct/src/showbase/ShowBaseGlobal.py
@@ -2,7 +2,7 @@
__all__ = []
-from ShowBase import *
+from .ShowBase import *
# Create the showbase instance
# This should be created by the game specific "start" file
@@ -20,8 +20,12 @@ def inspect(anObject):
Inspector = importlib.import_module('direct.tkpanels.Inspector')
return Inspector.inspect(anObject)
-import __builtin__
-__builtin__.inspect = inspect
+if sys.version_info >= (3, 0):
+ import builtins
+else:
+ import __builtin__ as builtins
+builtins.inspect = inspect
+
# this also appears in AIBaseGlobal
if (not __debug__) and __dev__:
notify = directNotify.newCategory('ShowBaseGlobal')
diff --git a/direct/src/showbase/ThreeUpShow.py b/direct/src/showbase/ThreeUpShow.py
index 5d32153ede..6449033c50 100644
--- a/direct/src/showbase/ThreeUpShow.py
+++ b/direct/src/showbase/ThreeUpShow.py
@@ -3,7 +3,7 @@
__all__ = ['ThreeUpShow']
-import ShowBase
+from . import ShowBase
class ThreeUpShow(ShowBase.ShowBase):
def __init__(self):
diff --git a/direct/src/showbase/TkGlobal.py b/direct/src/showbase/TkGlobal.py
index 1fdb89ac1a..bfdeb9b48f 100644
--- a/direct/src/showbase/TkGlobal.py
+++ b/direct/src/showbase/TkGlobal.py
@@ -1,8 +1,12 @@
""" This module is now vestigial. """
-from Tkinter import *
import sys, Pmw
+if sys.version_info >= (3, 0):
+ from tkinter import *
+else:
+ from Tkinter import *
+
# This is required by the ihooks.py module used by Squeeze (used by
# pandaSqueezer.py) so that Pmw initializes properly
if '_Pmw' in sys.modules:
diff --git a/direct/src/showbase/VFSImporter.py b/direct/src/showbase/VFSImporter.py
index eb2b7bd7d4..807b931ab0 100644
--- a/direct/src/showbase/VFSImporter.py
+++ b/direct/src/showbase/VFSImporter.py
@@ -6,7 +6,6 @@ import sys
import marshal
import imp
import types
-import __builtin__
# The sharedPackages dictionary lists all of the "shared packages",
# special Python packages that automatically span multiple directories
@@ -305,7 +304,7 @@ class VFSLoader:
if source and source[-1] != '\n':
source = source + '\n'
- code = __builtin__.compile(source, filename.toOsSpecific(), 'exec')
+ code = compile(source, filename.toOsSpecific(), 'exec')
# try to cache the compiled code
pycFilename = Filename(filename)
@@ -449,7 +448,7 @@ class VFSSharedLoader:
mod = loader.load_module(fullname, loadingShared = True)
except ImportError:
etype, evalue, etraceback = sys.exc_info()
- print "%s on %s: %s" % (etype.__name__, fullname, evalue)
+ print("%s on %s: %s" % (etype.__name__, fullname, evalue))
if not message:
message = '%s: %s' % (fullname, evalue)
continue
@@ -509,7 +508,7 @@ def reloadSharedPackage(mod):
# Also force any child packages to become shared packages, if
# they aren't already.
- for basename, child in mod.__dict__.items():
+ for basename, child in list(mod.__dict__.items()):
if isinstance(child, types.ModuleType):
childname = child.__name__
if childname == fullname + '.' + basename and \
diff --git a/direct/src/showbase/VerboseImport.py b/direct/src/showbase/VerboseImport.py
index a8e2ef7317..56efc33b23 100644
--- a/direct/src/showbase/VerboseImport.py
+++ b/direct/src/showbase/VerboseImport.py
@@ -19,13 +19,13 @@ def newimport(*args, **kw):
name = args[0]
# Only print the name if we have not imported this before
if name not in sys.modules:
- print (" "*indentLevel + "import " + args[0])
+ print((" "*indentLevel + "import " + args[0]))
fPrint = 1
indentLevel += 1
result = oldimport(*args, **kw)
indentLevel -= 1
if fPrint:
- print (" "*indentLevel + "DONE: import " + args[0])
+ print((" "*indentLevel + "DONE: import " + args[0]))
return result
# Replace the builtin import with our new import
diff --git a/direct/src/showbase/pandaSqueezeTool.py b/direct/src/showbase/pandaSqueezeTool.py
index fd87135930..e19d660c22 100755
--- a/direct/src/showbase/pandaSqueezeTool.py
+++ b/direct/src/showbase/pandaSqueezeTool.py
@@ -52,15 +52,14 @@ __all__ = ['usage', 'Squeezer', 'Loader', 'boot', 'open', 'explode', 'getloader'
VERSION = "1.6/98-05-04"
MAGIC = "[PANDASQUEEZE]"
-import base64, imp, marshal, os, string, sys
+import base64, imp, marshal, os, sys
# --------------------------------------------------------------------
# usage
def usage():
- print
- print "SQUEEZE", VERSION, "(c) 1997-1998 by Secret Labs AB"
- print """\
+ print("\nSQUEEZE", VERSION, "(c) 1997-1998 by Secret Labs AB")
+ print("""\
Convert a Python application to a compressed module package.
Usage: squeeze [-1ux] -o app [-b start] modules... [-d files...]
@@ -87,7 +86,7 @@ StringIO file object).
The -x option can be used with -d to create a self-extracting archive,
instead of a package. When the resulting script is executed, the
data files are extracted. Omit the -b option in this case.
-"""
+""")
sys.exit(1)
@@ -199,9 +198,9 @@ def boot(name, fp, size, offset = 0):
loaderopen = """
def open(name):
- import StringIO
+ from io import StringIO
try:
- return StringIO.StringIO(data["+"+name])
+ return StringIO(data["+"+name])
except KeyError:
raise IOError, (0, "no such file")
"""
@@ -268,12 +267,12 @@ def squeeze(app, start, filelist, outputDir):
try:
fp = open(bootstrap)
s = fp.readline()
- string.index(s, MAGIC)
+ s.index(MAGIC)
except IOError:
pass
except ValueError:
- print bootstrap, "was not created by squeeze. You have to manually"
- print "remove the file to proceed."
+ print("%s was not created by squeeze. You have to manually" % (bootstrap))
+ print("remove the file to proceed.")
sys.exit(1)
#
@@ -298,7 +297,7 @@ def squeeze(app, start, filelist, outputDir):
loaderlen = len(loader)
magic = repr(imp.get_magic())
- version = string.split(sys.version)[0]
+ version = sys.version.split()[0]
#
# generate script and package files
@@ -372,5 +371,4 @@ exec "from %(start)s import *"
dummy, rawbytes = sq.getstatus()
- print "squeezed", rawbytes, "to", bytes, "bytes",
- print "(%d%%)" % (bytes * 100 / rawbytes)
+ print("squeezed %s to %s (%d%%)" % (rawbytes, bytes, bytes * 100 / rawbytes))
diff --git a/direct/src/showbase/pandaSqueezer.py b/direct/src/showbase/pandaSqueezer.py
index 707bafc204..84beee7813 100644
--- a/direct/src/showbase/pandaSqueezer.py
+++ b/direct/src/showbase/pandaSqueezer.py
@@ -5,18 +5,18 @@ __all__ = []
import os
import sys
import getopt
-import pandaSqueezeTool
+from . import pandaSqueezeTool
# Assumption: We will be squeezing the files from the current directory or the -d directory.
if __name__ == "__main__":
try:
opts, pargs = getopt.getopt(sys.argv[1:], 'Od:')
- except Exception, e:
+ except Exception as e:
# User passed in a bad option, print the error and the help, then exit
- print e
- print 'Usage: pass in -O for optimized'
- print ' pass in -d directory'
+ print(e)
+ print('Usage: pass in -O for optimized')
+ print(' pass in -d directory')
sys.exit()
fOptimized = 0
@@ -25,7 +25,7 @@ if __name__ == "__main__":
flag, value = opt
if (flag == '-O'):
fOptimized = 1
- print 'Squeezing pyo files'
+ print('Squeezing pyo files')
elif (flag == '-d'):
os.chdir(value)
diff --git a/direct/src/showutil/Effects.py b/direct/src/showutil/Effects.py
index effaa426c6..d98223711b 100644
--- a/direct/src/showutil/Effects.py
+++ b/direct/src/showutil/Effects.py
@@ -105,7 +105,7 @@ def createBounce(nodeObj, numBounces, startValues, totalTime, amplitude,
newVec3 = Vec3(startValues)
newVec3.setCell(index, currBounceVal)
- print "### newVec3 = ", newVec3
+ print("### newVec3 = %s" % newVec3)
# create the right type of lerp
if ((bounceType == SX_BOUNCE) or (bounceType == SY_BOUNCE) or
diff --git a/direct/src/showutil/FreezeTool.py b/direct/src/showutil/FreezeTool.py
index ad99f8c629..89016e274d 100644
--- a/direct/src/showutil/FreezeTool.py
+++ b/direct/src/showutil/FreezeTool.py
@@ -7,8 +7,7 @@ import os
import marshal
import imp
import platform
-import types
-from StringIO import StringIO
+from io import StringIO
from distutils.sysconfig import PREFIX, get_python_inc, get_python_version, get_config_var
# Temporary (?) try..except to protect against unbuilt p3extend_frozen.
@@ -97,7 +96,7 @@ class CompilationEnvironment:
elif (Filename('/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7').exists()):
self.MSVC = Filename('/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7').toOsSpecific()
else:
- print 'Could not locate Microsoft Visual C++ Compiler! Try running from the Visual Studio Command Prompt.'
+ print('Could not locate Microsoft Visual C++ Compiler! Try running from the Visual Studio Command Prompt.')
sys.exit(1)
if ('WindowsSdkDir' in os.environ):
@@ -107,7 +106,7 @@ class CompilationEnvironment:
elif (os.path.exists(os.path.join(self.MSVC, 'PlatformSDK'))):
self.PSDK = os.path.join(self.MSVC, 'PlatformSDK')
else:
- print 'Could not locate the Microsoft Windows Platform SDK! Try running from the Visual Studio Command Prompt.'
+ print('Could not locate the Microsoft Windows Platform SDK! Try running from the Visual Studio Command Prompt.')
sys.exit(1)
# We need to use the correct compiler setting for debug vs. release builds.
@@ -169,7 +168,7 @@ class CompilationEnvironment:
'filename' : filename,
'basename' : basename,
}
- print >> sys.stderr, compile
+ sys.stderr.write(compile + '\n')
if os.system(compile) != 0:
raise Exception('failed to compile %s.' % basename)
@@ -184,7 +183,7 @@ class CompilationEnvironment:
'filename' : filename,
'basename' : basename,
}
- print >> sys.stderr, link
+ sys.stderr.write(link + '\n')
if os.system(link) != 0:
raise Exception('failed to link %s.' % basename)
@@ -201,7 +200,7 @@ class CompilationEnvironment:
'filename' : filename,
'basename' : basename,
}
- print >> sys.stderr, compile
+ sys.stderr.write(compile + '\n')
if os.system(compile) != 0:
raise Exception('failed to compile %s.' % basename)
@@ -217,7 +216,7 @@ class CompilationEnvironment:
'basename' : basename,
'dllext' : self.dllext,
}
- print >> sys.stderr, link
+ sys.stderr.write(link + '\n')
if os.system(link) != 0:
raise Exception('failed to link %s.' % basename)
@@ -547,14 +546,15 @@ int PyInitFrozenExtensions()
"""
okMissing = [
+ '__main__', '_dummy_threading', 'Carbon', 'Carbon.Files',
'Carbon.Folder', 'Carbon.Folders', 'HouseGlobals', 'Carbon.File',
'MacOS', '_emx_link', 'ce', 'mac', 'org.python.core', 'os.path',
'os2', 'posix', 'pwd', 'readline', 'riscos', 'riscosenviron',
- 'riscospath', 'dbm', 'fcntl', 'win32api', 'usercustomize',
- '_winreg', 'ctypes', 'ctypes.wintypes', 'nt','msvcrt',
- 'EasyDialogs', 'SOCKS', 'ic', 'rourl2path', 'termios',
+ 'riscospath', 'dbm', 'fcntl', 'win32api', 'win32pipe', 'usercustomize',
+ '_winreg', 'winreg', 'ctypes', 'ctypes.wintypes', 'nt','msvcrt',
+ 'EasyDialogs', 'SOCKS', 'ic', 'rourl2path', 'termios', 'vms_lib',
'OverrideFrom23._Res', 'email', 'email.Utils', 'email.Generator',
- 'email.Iterators', '_subprocess', 'gestalt',
+ 'email.Iterators', '_subprocess', 'gestalt', 'java.lang',
'direct.extensions_native.extensions_darwin',
]
@@ -570,7 +570,7 @@ class Freezer:
# The file on disk it was loaded from, if any.
self.filename = filename
- if isinstance(filename, types.StringTypes):
+ if filename is not None and not isinstance(filename, Filename):
self.filename = Filename(filename)
# True if the module was found via the modulefinder.
@@ -681,7 +681,7 @@ class Freezer:
# Actually, make sure we know how to find all of the
# already-imported modules. (Some of them might do their own
# special path mangling.)
- for moduleName, module in sys.modules.items():
+ for moduleName, module in list(sys.modules.items()):
if module and hasattr(module, '__path__'):
path = getattr(module, '__path__')
if path:
@@ -694,7 +694,7 @@ class Freezer:
constructor, but it may be called at any point during
processing. """
- for key, value in freezer.modules.items():
+ for key, value in list(freezer.modules.items()):
self.previousModules[key] = value
self.modules[key] = value
@@ -737,7 +737,7 @@ class Freezer:
try:
module = __import__(moduleName)
except:
- print "couldn't import %s" % (moduleName)
+ print("couldn't import %s" % (moduleName))
module = None
if module != None:
@@ -776,7 +776,7 @@ class Freezer:
try:
module = __import__(moduleName)
except:
- print "couldn't import %s" % (moduleName)
+ print("couldn't import %s" % (moduleName))
module = None
if module != None:
@@ -911,7 +911,7 @@ class Freezer:
# Walk through the list in sorted order, so we reach parents
# before children.
- names = self.modules.items()
+ names = list(self.modules.items())
names.sort()
excludeDict = {}
@@ -936,7 +936,7 @@ class Freezer:
else:
includes.append(mdef)
- self.mf = PandaModuleFinder(excludes = excludeDict.keys())
+ self.mf = PandaModuleFinder(excludes = list(excludeDict.keys()))
# Attempt to import the explicit modules into the modulefinder.
@@ -952,7 +952,7 @@ class Freezer:
try:
self.__loadModule(mdef)
except ImportError:
- print "Unknown module: %s" % (mdef.moduleName)
+ print("Unknown module: %s" % (mdef.moduleName))
# Also attempt to import any implicit modules. If any of
# these fail to import, we don't really care.
@@ -967,7 +967,7 @@ class Freezer:
pass
# Now, any new modules we found get added to the export list.
- for origName in self.mf.modules.keys():
+ for origName in list(self.mf.modules.keys()):
if origName not in origToNewName:
self.modules[origName] = self.ModuleDef(origName, implicit = True)
@@ -996,7 +996,7 @@ class Freezer:
if missing:
missing.sort()
- print "There are some missing modules: %r" % missing
+ print("There are some missing modules: %r" % missing)
def __sortModuleKey(self, mdef):
""" A sort key function to sort a list of mdef's into order,
@@ -1072,7 +1072,7 @@ class Freezer:
moduleNames = []
- for newName, mdef in self.modules.items():
+ for newName, mdef in list(self.modules.items()):
if mdef.guess:
# Not really a module.
pass
@@ -1092,7 +1092,7 @@ class Freezer:
moduleDefs = []
- for newName, mdef in self.modules.items():
+ for newName, mdef in list(self.modules.items()):
prev = self.previousModules.get(newName, None)
if not mdef.exclude:
# Include this module (even if a previous pass
@@ -1118,7 +1118,7 @@ class Freezer:
# actual filename we put in there is meaningful only for stack
# traces, so we'll just use the module name.
replace_paths = []
- for moduleName, module in self.mf.modules.items():
+ for moduleName, module in list(self.mf.modules.items()):
if module.__code__:
origPathname = module.__code__.co_filename
replace_paths.append((origPathname, moduleName))
@@ -1126,7 +1126,7 @@ class Freezer:
# Now that we have built up the replacement mapping, go back
# through and actually replace the paths.
- for moduleName, module in self.mf.modules.items():
+ for moduleName, module in list(self.mf.modules.items()):
if module.__code__:
co = self.mf.replace_paths_in_code(module.__code__)
module.__code__ = co;
diff --git a/direct/src/showutil/Rope.py b/direct/src/showutil/Rope.py
index 1e65411684..1c3af011d6 100644
--- a/direct/src/showutil/Rope.py
+++ b/direct/src/showutil/Rope.py
@@ -1,5 +1,5 @@
from panda3d.core import *
-import types
+
class Rope(NodePath):
"""
@@ -96,7 +96,7 @@ class Rope(NodePath):
for i in range(numVerts):
v = self.verts[i]
- if isinstance(v, types.TupleType):
+ if isinstance(v, tuple):
nodePath, point = v
color = defaultColor
thickness = defaultThickness
@@ -106,7 +106,7 @@ class Rope(NodePath):
color = v.get('color', defaultColor)
thickness = v.get('thickness', defaultThickness)
- if isinstance(point, types.TupleType):
+ if isinstance(point, tuple):
if (len(point) >= 4):
self.curve.setVertex(i, VBase4(point[0], point[1], point[2], point[3]))
else:
diff --git a/direct/src/showutil/TexMemWatcher.py b/direct/src/showutil/TexMemWatcher.py
index d4d91ae1d3..843395d58d 100644
--- a/direct/src/showutil/TexMemWatcher.py
+++ b/direct/src/showutil/TexMemWatcher.py
@@ -729,7 +729,7 @@ class TexMemWatcher(DirectObject):
# Sort the regions from largest to smallest to maximize
# packing effectiveness.
- texRecords = self.texRecordsByTex.values()
+ texRecords = list(self.texRecordsByTex.values())
texRecords.sort(key = lambda tr: (tr.tw, tr.th), reverse = True)
for tr in texRecords:
diff --git a/direct/src/showutil/pfreeze.py b/direct/src/showutil/pfreeze.py
index 5bcc3c41ee..8676251026 100755
--- a/direct/src/showutil/pfreeze.py
+++ b/direct/src/showutil/pfreeze.py
@@ -53,8 +53,9 @@ import os
from direct.showutil import FreezeTool
def usage(code, msg = ''):
- print >> sys.stderr, __doc__
- print >> sys.stderr, msg
+ if __doc__:
+ sys.stderr.write(__doc__ + '\n')
+ sys.stderr.write(msg + '\n')
sys.exit(code)
# We're not protecting the next part under a __name__ == __main__
@@ -67,7 +68,7 @@ addStartupModules = False
try:
opts, args = getopt.getopt(sys.argv[1:], 'o:i:x:p:sh')
-except getopt.error, msg:
+except getopt.error as msg:
usage(1, msg)
for opt, arg in opts:
@@ -87,7 +88,7 @@ for opt, arg in opts:
elif opt == '-h':
usage(0)
else:
- print 'illegal option: ' + flag
+ print('illegal option: ' + flag)
sys.exit(1)
if not basename:
diff --git a/direct/src/stdpy/file.py b/direct/src/stdpy/file.py
index d6ef48cd9e..222739612a 100644
--- a/direct/src/stdpy/file.py
+++ b/direct/src/stdpy/file.py
@@ -26,6 +26,12 @@ if sys.version_info < (3, 0):
FileExistsError = IOError
PermissionError = IOError
+ unicodeType = unicode
+ strType = str
+else:
+ unicodeType = str
+ strType = ()
+
def open(file, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True):
if sys.version_info >= (3, 0):
@@ -70,11 +76,11 @@ def open(file, mode='r', buffering=-1, encoding=None, errors=None, newline=None,
# We can also "open" a VirtualFile object for reading.
vfile = file
filename = vfile.getFilename()
- elif isinstance(file, unicode):
+ elif isinstance(file, unicodeType):
# If a raw string is given, assume it's an os-specific
# filename.
filename = core.Filename.fromOsSpecificW(file)
- elif isinstance(file, str):
+ elif isinstance(file, strType):
filename = core.Filename.fromOsSpecific(file)
else:
# If a Filename is given, make a writable copy anyway.
diff --git a/direct/src/stdpy/glob.py b/direct/src/stdpy/glob.py
index 6f825a4561..28eee2cb6e 100755
--- a/direct/src/stdpy/glob.py
+++ b/direct/src/stdpy/glob.py
@@ -53,7 +53,7 @@ def iglob(pathname):
def glob1(dirname, pattern):
if not dirname:
dirname = os.curdir
- if isinstance(pattern, unicode) and not isinstance(dirname, unicode):
+ if sys.version_info < (3, 0) and isinstance(pattern, unicode) and not isinstance(dirname, unicode):
dirname = unicode(dirname, sys.getfilesystemencoding() or
sys.getdefaultencoding())
try:
diff --git a/direct/src/stdpy/pickle.py b/direct/src/stdpy/pickle.py
index ae46f3967b..57e7c2521c 100644
--- a/direct/src/stdpy/pickle.py
+++ b/direct/src/stdpy/pickle.py
@@ -139,7 +139,7 @@ class Unpickler(pickle.Unpickler):
try:
from cStringIO import StringIO
except ImportError:
- from StringIO import StringIO
+ from io import StringIO
def dump(obj, file, protocol=None):
Pickler(file, protocol).dump(obj)
diff --git a/direct/src/stdpy/thread.py b/direct/src/stdpy/thread.py
index ccbc141b5b..d10a47fb54 100644
--- a/direct/src/stdpy/thread.py
+++ b/direct/src/stdpy/thread.py
@@ -240,7 +240,7 @@ class _local(object):
# Delete this key from all threads.
_threadsLock.acquire()
try:
- for thread, locals, wrapper in _threads.values():
+ for thread, locals, wrapper in list(_threads.values()):
try:
del locals[i]
except KeyError:
diff --git a/direct/src/stdpy/threading.py b/direct/src/stdpy/threading.py
index 3fa576e712..4c0ce1e8fb 100644
--- a/direct/src/stdpy/threading.py
+++ b/direct/src/stdpy/threading.py
@@ -21,7 +21,6 @@ easier to use and understand.
It is permissible to mix-and-match both threading and threading2
within the same application. """
-import direct
from panda3d import core
from direct.stdpy import thread as _thread
import sys as _sys
@@ -380,7 +379,7 @@ def enumerate():
tlist = []
_thread._threadsLock.acquire()
try:
- for thread, locals, wrapper in _thread._threads.values():
+ for thread, locals, wrapper in list(_thread._threads.values()):
if wrapper and thread.isStarted():
tlist.append(wrapper)
return tlist
@@ -484,7 +483,7 @@ if __debug__:
def run(self):
while self.count > 0:
item = self.queue.get()
- print item
+ print(item)
self.count = self.count - 1
NP = 3
diff --git a/direct/src/stdpy/threading2.py b/direct/src/stdpy/threading2.py
index b9df97ca97..9beee770c0 100644
--- a/direct/src/stdpy/threading2.py
+++ b/direct/src/stdpy/threading2.py
@@ -480,19 +480,16 @@ class Thread(_Verbose):
# Lib/traceback.py)
exc_type, exc_value, exc_tb = self.__exc_info()
try:
- print>>self.__stderr, (
- "Exception in thread " + self.getName() +
- " (most likely raised during interpreter shutdown):")
- print>>self.__stderr, (
- "Traceback (most recent call last):")
+ self.__stderr.write("Exception in thread " + self.getName() +
+ " (most likely raised during interpreter shutdown):\n")
+ self.__stderr.write("Traceback (most recent call last):\n")
while exc_tb:
- print>>self.__stderr, (
- ' File "%s", line %s, in %s' %
+ self.__stderr.write(' File "%s", line %s, in %s\n' %
(exc_tb.tb_frame.f_code.co_filename,
exc_tb.tb_lineno,
exc_tb.tb_frame.f_code.co_name))
exc_tb = exc_tb.tb_next
- print>>self.__stderr, ("%s: %s" % (exc_type, exc_value))
+ self.__stderr.write("%s: %s\n" % (exc_type, exc_value))
# Make sure that exc_tb gets deleted since it is a memory
# hog; deleting everything else is just for thoroughness
finally:
@@ -710,7 +707,7 @@ def activeCount():
def enumerate():
_active_limbo_lock.acquire()
- active = _active.values() + _limbo.values()
+ active = list(_active.values()) + list(_limbo.values())
_active_limbo_lock.release()
return active
@@ -794,7 +791,7 @@ if __debug__:
def run(self):
while self.count > 0:
item = self.queue.get()
- print item
+ print(item)
self.count = self.count - 1
NP = 3
diff --git a/direct/src/task/FrameProfiler.py b/direct/src/task/FrameProfiler.py
index b524dbf1c1..4207937d1c 100755
--- a/direct/src/task/FrameProfiler.py
+++ b/direct/src/task/FrameProfiler.py
@@ -35,15 +35,15 @@ class FrameProfiler:
24 * FrameProfiler.Minute,
]
for t in self._logSchedule:
- assert isInteger(t)
+ #assert isInteger(t)
# make sure the period is evenly divisible into each element of the log schedule
assert (t % self._period) == 0
# make sure each element of the schedule is evenly divisible into each subsequent element
- for i in xrange(len(self._logSchedule)):
+ for i in range(len(self._logSchedule)):
e = self._logSchedule[i]
- for j in xrange(i, len(self._logSchedule)):
+ for j in range(i, len(self._logSchedule)):
assert (self._logSchedule[j] % e) == 0
- assert isInteger(self._period)
+ #assert isInteger(self._period)
self._enableFC = FunctionCall(self._setEnabled, taskMgr.getProfileFramesSV())
self._enableFC.pushCurrentState()
@@ -66,13 +66,13 @@ class FrameProfiler:
else:
self._task.remove()
del self._task
- for session in self._period2aggregateProfile.itervalues:
+ for session in self._period2aggregateProfile.values():
session.release()
del self._period2aggregateProfile
- for task in self._id2task.itervalues():
+ for task in self._id2task.values():
task.remove()
del self._id2task
- for session in self._id2session.itervalues():
+ for session in self._id2session.values():
session.release()
del self._id2session
self.notify.info('frame profiler stopped')
@@ -84,7 +84,7 @@ class FrameProfiler:
def _scheduleNextProfile(self):
self._profileCounter += 1
self._timeElapsed = self._profileCounter * self._period
- assert isInteger(self._timeElapsed)
+ #assert isInteger(self._timeElapsed)
time = self._startTime + self._timeElapsed
# vary the actual delay between profiles by a random amount to prevent interaction
@@ -121,7 +121,7 @@ class FrameProfiler:
else:
gen = self._doAnalysisGen(sessionId)
task._generator = gen
- result = gen.next()
+ result = next(gen)
if result == Task.done:
del task._generator
return result
@@ -150,7 +150,7 @@ class FrameProfiler:
# log profiles when it's time, and aggregate them upwards into the
# next-longer profile
- for pi in xrange(len(self._logSchedule)):
+ for pi in range(len(self._logSchedule)):
period = self._logSchedule[pi]
if (self._timeElapsed % period) == 0:
if period in p2ap:
diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py
index bce3b127e1..e12b64078d 100644
--- a/direct/src/task/Task.py
+++ b/direct/src/task/Task.py
@@ -42,21 +42,21 @@ def print_exc_plus():
f = f.f_back
stack.reverse()
traceback.print_exc()
- print "Locals by frame, innermost last"
+ print("Locals by frame, innermost last")
for frame in stack:
- print
- print "Frame %s in %s at line %s" % (frame.f_code.co_name,
+ print("")
+ print("Frame %s in %s at line %s" % (frame.f_code.co_name,
frame.f_code.co_filename,
- frame.f_lineno)
- for key, value in frame.f_locals.items():
- print "\t%20s = " % key,
+ frame.f_lineno))
+ for key, value in list(frame.f_locals.items()):
#We have to be careful not to cause a new error in our error
#printer! Calling str() on an unknown object could cause an
#error we don't want.
try:
- print value
+ valueStr = str(value)
except:
- print ""
+ valueStr = ""
+ print("\t%20s = %s" % (key, valueStr))
# For historical purposes, we remap the C++-defined enumeration to
# these Python names, and define them both at the module level, here,
@@ -153,7 +153,7 @@ class TaskManager:
clock = property(lambda self: self.mgr.getClock(), setClock)
def invokeDefaultHandler(self, signalNumber, stackFrame):
- print '*** allowing mid-frame keyboard interrupt.'
+ print('*** allowing mid-frame keyboard interrupt.')
# Restore default interrupt handler
if signal:
signal.signal(signal.SIGINT, signal.default_int_handler)
@@ -164,9 +164,9 @@ class TaskManager:
self.fKeyboardInterrupt = 1
self.interruptCount += 1
if self.interruptCount == 1:
- print '* interrupt by keyboard'
+ print('* interrupt by keyboard')
elif self.interruptCount == 2:
- print '** waiting for end of frame before interrupting...'
+ print('** waiting for end of frame before interrupting...')
# The user must really want to interrupt this process
# Next time around invoke the default handler
signal.signal(signal.SIGINT, self.invokeDefaultHandler)
@@ -397,7 +397,7 @@ class TaskManager:
'Task %s does not accept arguments.' % (repr(task)))
if name is not None:
- assert isinstance(name, types.StringTypes), 'Name must be a string type'
+ assert isinstance(name, str), 'Name must be a string type'
task.setName(name)
assert task.hasName()
@@ -431,12 +431,12 @@ class TaskManager:
all tasks with the indicated name are removed. Returns the
number of tasks removed. """
- if isinstance(taskOrName, types.StringTypes):
+ if isinstance(taskOrName, str):
tasks = self.mgr.findTasks(taskOrName)
return self.mgr.remove(tasks)
elif isinstance(taskOrName, AsyncTask):
return self.mgr.remove(taskOrName)
- elif isinstance(taskOrName, types.ListType):
+ elif isinstance(taskOrName, list):
for task in taskOrName:
self.remove(task)
else:
@@ -520,7 +520,7 @@ class TaskManager:
except SystemExit:
self.stop()
raise
- except IOError, ioError:
+ except IOError as ioError:
code, message = self._unpackIOError(ioError)
# Since upgrading to Python 2.4.1, pausing the execution
# often gives this IOError during the sleep function:
@@ -532,7 +532,7 @@ class TaskManager:
self.stop()
else:
raise
- except Exception, e:
+ except Exception as e:
if self.extendedExceptions:
self.stop()
print_exc_plus()
@@ -615,7 +615,7 @@ class TaskManager:
self._frameProfileQueue.push((num, session, callback))
def _doProfiledFrames(self, numFrames):
- for i in xrange(numFrames):
+ for i in range(numFrames):
result = self.step()
return result
@@ -1261,22 +1261,22 @@ if __debug__:
return task.done
obj = TestClass()
startRefCount = sys.getrefcount(obj)
- print 'sys.getrefcount(obj): %s' % sys.getrefcount(obj)
- print '** addTask'
+ print('sys.getrefcount(obj): %s' % sys.getrefcount(obj))
+ print('** addTask')
t = obj.addTask(obj.doTask, 'test')
- print 'sys.getrefcount(obj): %s' % sys.getrefcount(obj)
- print 'task.getRefCount(): %s' % t.getRefCount()
- print '** removeTask'
+ print('sys.getrefcount(obj): %s' % sys.getrefcount(obj))
+ print('task.getRefCount(): %s' % t.getRefCount())
+ print('** removeTask')
obj.removeTask('test')
- print 'sys.getrefcount(obj): %s' % sys.getrefcount(obj)
- print 'task.getRefCount(): %s' % t.getRefCount()
- print '** step'
+ print('sys.getrefcount(obj): %s' % sys.getrefcount(obj))
+ print('task.getRefCount(): %s' % t.getRefCount())
+ print('** step')
taskMgr.step()
taskMgr.step()
taskMgr.step()
- print 'sys.getrefcount(obj): %s' % sys.getrefcount(obj)
- print 'task.getRefCount(): %s' % t.getRefCount()
- print '** task release'
+ print('sys.getrefcount(obj): %s' % sys.getrefcount(obj))
+ print('task.getRefCount(): %s' % t.getRefCount())
+ print('** task release')
t = None
- print 'sys.getrefcount(obj): %s' % sys.getrefcount(obj)
+ print('sys.getrefcount(obj): %s' % sys.getrefcount(obj))
assert sys.getrefcount(obj) == startRefCount
diff --git a/direct/src/task/TaskManagerGlobal.py b/direct/src/task/TaskManagerGlobal.py
index 4c95232c4d..60587d7a4f 100644
--- a/direct/src/task/TaskManagerGlobal.py
+++ b/direct/src/task/TaskManagerGlobal.py
@@ -2,6 +2,6 @@
__all__ = ['taskMgr']
-import Task
+from . import Task
taskMgr = Task.TaskManager()
diff --git a/direct/src/task/TaskProfiler.py b/direct/src/task/TaskProfiler.py
index ceb83b2e15..e099f82905 100755
--- a/direct/src/task/TaskProfiler.py
+++ b/direct/src/task/TaskProfiler.py
@@ -100,7 +100,7 @@ class TaskProfiler:
if taskMgr.getProfileTasks():
self._setEnabled(False)
self._enableFC.destroy()
- for tracker in self._namePrefix2tracker.itervalues():
+ for tracker in self._namePrefix2tracker.values():
tracker.destroy()
del self._namePrefix2tracker
del self._task
@@ -119,7 +119,7 @@ class TaskProfiler:
def logProfiles(self, name=None):
if name:
name = name.lower()
- for namePrefix, tracker in self._namePrefix2tracker.iteritems():
+ for namePrefix, tracker in self._namePrefix2tracker.items():
if (name and (name not in namePrefix.lower())):
continue
tracker.log()
@@ -128,7 +128,7 @@ class TaskProfiler:
if name:
name = name.lower()
# flush stored task profiles
- for namePrefix, tracker in self._namePrefix2tracker.iteritems():
+ for namePrefix, tracker in self._namePrefix2tracker.items():
if (name and (name not in namePrefix.lower())):
continue
tracker.flush()
diff --git a/direct/src/task/Timer.py b/direct/src/task/Timer.py
index fb773a7c42..be7957183c 100644
--- a/direct/src/task/Timer.py
+++ b/direct/src/task/Timer.py
@@ -2,7 +2,7 @@
__all__ = ['Timer']
-import Task
+from . import Task
class Timer:
id = 0
diff --git a/direct/src/tkpanels/AnimPanel.py b/direct/src/tkpanels/AnimPanel.py
index c48320efab..8cee51e1a6 100644
--- a/direct/src/tkpanels/AnimPanel.py
+++ b/direct/src/tkpanels/AnimPanel.py
@@ -9,11 +9,15 @@ __all__ = ['AnimPanel', 'ActorControl']
# Import Tkinter, Pmw, and the floater code from this directory tree.
from direct.tkwidgets.AppShell import *
from direct.showbase.TkGlobal import *
-from tkSimpleDialog import askfloat
-from Tkinter import *
-import Pmw, string, types
+import Pmw, sys
from direct.task import Task
+if sys.version_info >= (3, 0):
+ from tkinter.simpledialog import askfloat
+else:
+ from tkSimpleDialog import askfloat
+
+
FRAMES = 0
SECONDS = 1
@@ -28,8 +32,7 @@ class AnimPanel(AppShell):
def __init__(self, aList = [], parent = None, session = None, **kw):
INITOPT = Pmw.INITOPT
- if ((type(aList) == types.ListType) or
- (type(aList) == types.TupleType)):
+ if isinstance(aList, (list, tuple)):
kw['actorList'] = aList
else:
kw['actorList'] = [aList]
@@ -201,7 +204,7 @@ class AnimPanel(AppShell):
self.actorControlList = []
for actor in self['actorList']:
anims = actor.getAnimNames()
- print "actor animnames: %s"%anims
+ print("actor animnames: %s"%anims)
topAnims = []
if 'neutral' in anims:
i = anims.index('neutral')
@@ -518,7 +521,7 @@ class ActorControl(Pmw.MegaWidget):
if (self.fps == None):
# there was probably a problem loading the
# active animation, set default anim properties
- print "unable to get animation fps, zeroing out animation info"
+ print("unable to get animation fps, zeroing out animation info")
self.fps = 24
self.duration = 0
self.maxFrame = 0
@@ -624,7 +627,7 @@ class ActorControl(Pmw.MegaWidget):
def goTo(self, t):
# Convert scale value to float
- t = string.atof(t)
+ t = float(t)
# Now convert t to seconds for offset calculations
if self.unitsVar.get() == FRAMES:
t = t / self.fps
diff --git a/direct/src/tkpanels/DirectSessionPanel.py b/direct/src/tkpanels/DirectSessionPanel.py
index 54a515895d..65a262eda3 100644
--- a/direct/src/tkpanels/DirectSessionPanel.py
+++ b/direct/src/tkpanels/DirectSessionPanel.py
@@ -5,15 +5,14 @@ __all__ = ['DirectSessionPanel']
# Import Tkinter, Pmw, and the dial code
from direct.showbase.TkGlobal import *
from direct.tkwidgets.AppShell import *
-from Tkinter import *
from panda3d.core import *
-import Pmw, string
+import Pmw
from direct.tkwidgets import Dial
from direct.tkwidgets import Floater
from direct.tkwidgets import Slider
from direct.tkwidgets import VectorWidgets
from direct.tkwidgets import SceneGraphExplorer
-from TaskManagerPanel import TaskManagerWidget
+from .TaskManagerPanel import TaskManagerWidget
from direct.tkwidgets import MemoryExplorer
"""
@@ -744,8 +743,8 @@ class DirectSessionPanel(AppShell):
color[2]/255.0)
def selectDisplayRegionNamed(self, name):
- if (string.find(name, 'Display Region ') >= 0):
- drIndex = string.atoi(name[-1:])
+ if name.find('Display Region ') >= 0:
+ drIndex = int(name[-1:])
self.activeDisplayRegion = base.direct.drList[drIndex]
else:
self.activeDisplayRegion = None
diff --git a/direct/src/tkpanels/FSMInspector.py b/direct/src/tkpanels/FSMInspector.py
index f6c5cc258e..14b307b300 100644
--- a/direct/src/tkpanels/FSMInspector.py
+++ b/direct/src/tkpanels/FSMInspector.py
@@ -4,9 +4,13 @@ __all__ = ['FSMInspector', 'StateInspector']
from direct.tkwidgets.AppShell import *
from direct.showbase.TkGlobal import *
-from tkSimpleDialog import askstring
-from Tkinter import *
-import Pmw, math, operator
+import Pmw, math, operator, sys
+
+if sys.version_info >= (3, 0):
+ from tkinter.simpledialog import askstring
+else:
+ from tkSimpleDialog import askstring
+
DELTA = (5.0 / 360.) * 2.0 * math.pi
@@ -115,14 +119,14 @@ class FSMInspector(AppShell):
self._canvas.itemconfigure('labels', font = ('MS Sans Serif', size))
def setMarkerSize(self, size):
- for key in self.stateInspectorDict.keys():
+ for key in self.stateInspectorDict:
self.stateInspectorDict[key].setRadius(size)
self.drawConnections()
def drawConnections(self, event = None):
# Get rid of existing arrows
self._canvas.delete('arrow')
- for key in self.stateInspectorDict.keys():
+ for key in self.stateInspectorDict:
si = self.stateInspectorDict[key]
state = si.state
if state.getTransitions():
@@ -236,7 +240,7 @@ class FSMInspector(AppShell):
self.setGridSize(self._gridSize)
def setGridSize(self, size):
- for key in self.stateInspectorDict.keys():
+ for key in self.stateInspectorDict:
self.stateInspectorDict[key].setGridSize(size)
def popupGridDialog(self):
@@ -253,29 +257,27 @@ class FSMInspector(AppShell):
def printLayout(self):
dict = self.stateInspectorDict
- keys = dict.keys()
- keys.sort
- print "ClassicFSM.ClassicFSM('%s', [" % self.name
+ keys = list(dict.keys())
+ keys.sort()
+ print("ClassicFSM.ClassicFSM('%s', [" % self.name)
for key in keys[:-1]:
si = dict[key]
center = si.center()
- print " State.State('%s'," % si.state.getName()
- print " %s," % si.state.getEnterFunc().__name__
- print " %s," % si.state.getExitFunc().__name__
- print " %s," % si.state.getTransitions()
- print " inspectorPos = ",
- print "[%.1f, %.1f])," % (center[0], center[1])
+ print(" State.State('%s'," % si.state.getName())
+ print(" %s," % si.state.getEnterFunc().__name__)
+ print(" %s," % si.state.getExitFunc().__name__)
+ print(" %s," % si.state.getTransitions())
+ print(" inspectorPos = [%.1f, %.1f])," % (center[0], center[1]))
for key in keys[-1:]:
si = dict[key]
center = si.center()
- print " State.State('%s'," % si.state.getName()
- print " %s," % si.state.getEnterFunc().__name__
- print " %s," % si.state.getExitFunc().__name__
- print " %s," % si.state.getTransitions()
- print " inspectorPos = ",
- print "[%.1f, %.1f])]," % (center[0], center[1])
- print " '%s'," % self.fsm.getInitialState().getName()
- print " '%s')" % self.fsm.getFinalState().getName()
+ print(" State.State('%s'," % si.state.getName())
+ print(" %s," % si.state.getEnterFunc().__name__)
+ print(" %s," % si.state.getExitFunc().__name__)
+ print(" %s," % si.state.getTransitions())
+ print(" inspectorPos = [%.1f, %.1f])]," % (center[0], center[1]))
+ print(" '%s'," % self.fsm.getInitialState().getName())
+ print(" '%s')" % self.fsm.getFinalState().getName())
def toggleBalloon(self):
if self.toggleBalloonVar.get():
@@ -434,7 +436,7 @@ class StateInspector(Pmw.MegaArchetype):
self.fsm.request(self.getName())
def inspectSubMachine(self):
- print 'inspect ' + self.tag + ' subMachine'
+ print('inspect ' + self.tag + ' subMachine')
for childFSM in self.state.getChildren():
FSMInspector(childFSM)
diff --git a/direct/src/tkpanels/Inspector.py b/direct/src/tkpanels/Inspector.py
index 98e4378e30..4480332699 100644
--- a/direct/src/tkpanels/Inspector.py
+++ b/direct/src/tkpanels/Inspector.py
@@ -8,7 +8,6 @@ so that I can just type: inspect(anObject) any time."""
__all__ = ['inspect', 'inspectorFor', 'Inspector', 'ModuleInspector', 'ClassInspector', 'InstanceInspector', 'FunctionInspector', 'InstanceMethodInspector', 'CodeInspector', 'ComplexInspector', 'DictionaryInspector', 'SequenceInspector', 'SliceInspector', 'InspectorWindow']
from direct.showbase.TkGlobal import *
-from Tkinter import *
import Pmw
### public API
@@ -26,7 +25,7 @@ def inspectorFor(anObject):
if typeName in _InspectorMap:
inspectorName = _InspectorMap[typeName]
else:
- print("Can't find an inspector for " + typeName)
+ print(("Can't find an inspector for " + typeName))
inspectorName = 'Inspector'
inspector = globals()[inspectorName](anObject)
return inspector
@@ -147,7 +146,7 @@ class ModuleInspector(Inspector):
class ClassInspector(Inspector):
def namedParts(self):
- return ['__bases__'] + self.object.__dict__.keys()
+ return ['__bases__'] + list(self.object.__dict__.keys())
def title(self):
return self.object.__name__ + ' Class'
@@ -184,7 +183,7 @@ class DictionaryInspector(Inspector):
def initializePartsList(self):
Inspector.initializePartsList(self)
- keys = self.object.keys()
+ keys = list(self.object.keys())
keys.sort()
for each in keys:
self._partsList.append(each)
@@ -422,7 +421,7 @@ class InspectorWindow:
('Place', NodePath.place),
('Set Color', NodePath.rgbPanel)])
elif isinstance(part, ClassicFSM.ClassicFSM):
- import FSMInspector
+ from . import FSMInspector
popupMenu = self.createPopupMenu(
part,
[('Inspect ClassicFSM', FSMInspector.FSMInspector)])
diff --git a/direct/src/tkpanels/MopathRecorder.py b/direct/src/tkpanels/MopathRecorder.py
index 3e7bc3e0c5..e829ce233f 100644
--- a/direct/src/tkpanels/MopathRecorder.py
+++ b/direct/src/tkpanels/MopathRecorder.py
@@ -11,15 +11,18 @@ from direct.directtools.DirectGlobals import *
from direct.directtools.DirectUtil import *
from direct.directtools.DirectGeometry import *
from direct.directtools.DirectSelection import *
-from tkFileDialog import *
-from Tkinter import *
-import Pmw, os, string
+import Pmw, os, sys
from direct.tkwidgets import Dial
from direct.tkwidgets import Floater
from direct.tkwidgets import Slider
from direct.tkwidgets import EntryScale
from direct.tkwidgets import VectorWidgets
-import __builtin__
+
+if sys.version_info >= (3, 0):
+ from tkinter.filedialog import *
+else:
+ from tkFileDialog import *
+
PRF_UTILITIES = [
'lambda: base.direct.camera.lookAt(render)',
@@ -347,7 +350,7 @@ class MopathRecorder(AppShell, DirectObject):
self.speedEntry.bind(
'',
lambda e = None, s = self: s.setSpeedScale(
- string.atof(s.speedVar.get())))
+ float(s.speedVar.get())))
self.speedEntry.pack(side = LEFT, expand = 0)
frame.pack(fill = X, expand = 1)
@@ -662,7 +665,7 @@ class MopathRecorder(AppShell, DirectObject):
marker if subnode selected
"""
taskMgr.remove(self.name + '-curveEditTask')
- print nodePath.id()
+ print(nodePath.getKey())
if nodePath.id() in self.playbackMarkerIds:
base.direct.select(self.playbackMarker)
elif nodePath.id() in self.tangentMarkerIds:
@@ -1105,7 +1108,7 @@ class MopathRecorder(AppShell, DirectObject):
def computeCurves(self):
# Check to make sure curve fitters have points
if (self.curveFitter.getNumSamples() == 0):
- print 'MopathRecorder.computeCurves: Must define curve first'
+ print('MopathRecorder.computeCurves: Must define curve first')
return
# Create curves
# XYZ
@@ -1351,7 +1354,7 @@ class MopathRecorder(AppShell, DirectObject):
def desampleCurve(self):
if (self.curveFitter.getNumSamples() == 0):
- print 'MopathRecorder.desampleCurve: Must define curve first'
+ print('MopathRecorder.desampleCurve: Must define curve first')
return
# NOTE: This is destructive, points will be deleted from curve fitter
self.curveFitter.desample(self.desampleFrequency)
@@ -1365,7 +1368,7 @@ class MopathRecorder(AppShell, DirectObject):
def sampleCurve(self, fCompute = 1):
if self.curveCollection == None:
- print 'MopathRecorder.sampleCurve: Must define curve first'
+ print('MopathRecorder.sampleCurve: Must define curve first')
return
# Reset curve fitters
self.curveFitter.reset()
@@ -1580,7 +1583,7 @@ class MopathRecorder(AppShell, DirectObject):
def cropCurve(self):
if self.pointSet == None:
- print 'Empty Point Set'
+ print('Empty Point Set')
return
# Keep handle on old points
oldPoints = self.pointSet
@@ -1623,8 +1626,8 @@ class MopathRecorder(AppShell, DirectObject):
else:
path = '.'
if not os.path.isdir(path):
- print 'MopathRecorder Info: Empty Model Path!'
- print 'Using current directory'
+ print('MopathRecorder Info: Empty Model Path!')
+ print('Using current directory')
path = '.'
mopathFilename = askopenfilename(
defaultextension = '.egg',
@@ -1662,8 +1665,8 @@ class MopathRecorder(AppShell, DirectObject):
else:
path = '.'
if not os.path.isdir(path):
- print 'MopathRecorder Info: Empty Model Path!'
- print 'Using current directory'
+ print('MopathRecorder Info: Empty Model Path!')
+ print('Using current directory')
path = '.'
mopathFilename = asksaveasfilename(
defaultextension = '.egg',
@@ -1760,7 +1763,7 @@ class MopathRecorder(AppShell, DirectObject):
kw['min'] = min
kw['maxVelocity'] = maxVelocity
kw['resolution'] = resolution
- widget = apply(Floater.Floater, (parent,), kw)
+ widget = Floater.Floater(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -1771,7 +1774,7 @@ class MopathRecorder(AppShell, DirectObject):
def createAngleDial(self, parent, category, text, balloonHelp,
command = None, **kw):
kw['text'] = text
- widget = apply(Dial.AngleDial, (parent,), kw)
+ widget = Dial.AngleDial(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -1789,7 +1792,7 @@ class MopathRecorder(AppShell, DirectObject):
kw['resolution'] = resolution
#widget = apply(EntryScale.EntryScale, (parent,), kw)
from direct.tkwidgets import Slider
- widget = apply(Slider.Slider, (parent,), kw)
+ widget = Slider.Slider(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(side = side, fill = fill, expand = expand)
@@ -1805,7 +1808,7 @@ class MopathRecorder(AppShell, DirectObject):
kw['min'] = min
kw['max'] = max
kw['resolution'] = resolution
- widget = apply(EntryScale.EntryScale, (parent,), kw)
+ widget = EntryScale.EntryScale(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(side = side, fill = fill, expand = expand)
@@ -1817,7 +1820,7 @@ class MopathRecorder(AppShell, DirectObject):
command = None, **kw):
# Set label's text
kw['text'] = text
- widget = apply(VectorWidgets.Vector2Entry, (parent,), kw)
+ widget = VectorWidgets.Vector2Entry(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -1829,7 +1832,7 @@ class MopathRecorder(AppShell, DirectObject):
command = None, **kw):
# Set label's text
kw['text'] = text
- widget = apply(VectorWidgets.Vector3Entry, (parent,), kw)
+ widget = VectorWidgets.Vector3Entry(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -1841,7 +1844,7 @@ class MopathRecorder(AppShell, DirectObject):
command = None, **kw):
# Set label's text
kw['text'] = text
- widget = apply(VectorWidgets.ColorEntry, (parent,), kw)
+ widget = VectorWidgets.ColorEntry(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -1913,4 +1916,3 @@ class MopathRecorder(AppShell, DirectObject):
self.cCam = self.cCamera.attachNewNode(self.cCamNode)
self.cDr.setCamera(self.cCam)
-
diff --git a/direct/src/tkpanels/NotifyPanel.py b/direct/src/tkpanels/NotifyPanel.py
index f1b8a0720b..9712903f7a 100644
--- a/direct/src/tkpanels/NotifyPanel.py
+++ b/direct/src/tkpanels/NotifyPanel.py
@@ -131,7 +131,7 @@ class NotifyPanel:
def _getPandaCategoriesAsList(self, pc, list):
import types
for item in pc:
- if type(item) == types.ListType:
+ if type(item) == list:
self._getPandaCategoriesAsList(item, list)
else:
list.append(item)
diff --git a/direct/src/tkpanels/ParticlePanel.py b/direct/src/tkpanels/ParticlePanel.py
index f07e9c4102..b712d7c7fb 100644
--- a/direct/src/tkpanels/ParticlePanel.py
+++ b/direct/src/tkpanels/ParticlePanel.py
@@ -5,8 +5,6 @@ __all__ = ['ParticlePanel']
# Import Tkinter, Pmw, and the floater code from this directory tree.
from direct.tkwidgets.AppShell import *
from direct.showbase.TkGlobal import *
-from tkFileDialog import *
-from tkSimpleDialog import askstring
from direct.tkwidgets import Dial
from direct.tkwidgets import Floater
from direct.tkwidgets import Slider
@@ -15,8 +13,14 @@ from direct.tkpanels import Placer
from direct.particles import ForceGroup
from direct.particles import Particles
from direct.particles import ParticleEffect
-from Tkinter import *
-import Pmw, os
+import Pmw, os, sys
+
+if sys.version_info >= (3, 0):
+ from tkinter.filedialog import *
+ from tkinter.simpledialog import askstring
+else:
+ from tkFileDialog import *
+ from tkSimpleDialog import askstring
from panda3d.core import *
from panda3d.physics import *
@@ -67,7 +71,7 @@ class ParticlePanel(AppShell):
self.initialiseoptions(ParticlePanel)
# Update panel values to reflect particle effect's state
- self.selectEffectNamed(self.effectsDict.keys()[0])
+ self.selectEffectNamed(next(iter(self.effectsDict)))
# Make sure labels/menus reflect current state
self.updateMenusAndLabels()
# Make sure there is a page for each forceGroup objects
@@ -976,7 +980,7 @@ class ParticlePanel(AppShell):
kw['min'] = min
kw['resolution'] = resolution
kw['numDigits'] = numDigits
- widget = apply(Floater.Floater, (parent,), kw)
+ widget = Floater.Floater(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -988,7 +992,7 @@ class ParticlePanel(AppShell):
command = None, **kw):
kw['text'] = text
kw['style'] = 'mini'
- widget = apply(Dial.AngleDial, (parent,), kw)
+ widget = Dial.AngleDial(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -1003,7 +1007,7 @@ class ParticlePanel(AppShell):
kw['min'] = min
kw['max'] = max
kw['resolution'] = resolution
- widget = apply(Slider.Slider, (parent,), kw)
+ widget = Slider.Slider(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -1015,7 +1019,7 @@ class ParticlePanel(AppShell):
command = None, **kw):
# Set label's text
kw['text'] = text
- widget = apply(VectorWidgets.Vector2Entry, (parent,), kw)
+ widget = VectorWidgets.Vector2Entry(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -1027,7 +1031,7 @@ class ParticlePanel(AppShell):
command = None, **kw):
# Set label's text
kw['text'] = text
- widget = apply(VectorWidgets.Vector3Entry, (parent,), kw)
+ widget = VectorWidgets.Vector3Entry(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -1039,7 +1043,7 @@ class ParticlePanel(AppShell):
command = None, **kw):
# Set label's text
kw['text'] = text
- widget = apply(VectorWidgets.ColorEntry, (parent,), kw)
+ widget = VectorWidgets.ColorEntry(parent, **kw)
# Do this after the widget so command isn't called on creation
widget['command'] = command
widget.pack(fill = X)
@@ -1111,8 +1115,7 @@ class ParticlePanel(AppShell):
self.effectsLabelMenu.delete(5, 'end')
self.effectsLabelMenu.add_separator()
# Add in a checkbutton for each effect (to toggle on/off)
- keys = self.effectsDict.keys()
- keys.sort()
+ keys = sorted(self.effectsDict.keys())
for name in keys:
effect = self.effectsDict[name]
self.effectsLabelMenu.add_command(
@@ -1194,7 +1197,7 @@ class ParticlePanel(AppShell):
self.mainNotebook.selectpage('System')
self.updateInfo('System')
else:
- print 'ParticlePanel: No effect named ' + name
+ print('ParticlePanel: No effect named ' + name)
def toggleEffect(self, effect, var):
if var.get():
@@ -1250,8 +1253,8 @@ class ParticlePanel(AppShell):
else:
path = '.'
if not os.path.isdir(path):
- print 'ParticlePanel Warning: Invalid default DNA directory!'
- print 'Using current directory'
+ print('ParticlePanel Warning: Invalid default DNA directory!')
+ print('Using current directory')
path = '.'
particleFilename = askopenfilename(
defaultextension = '.ptf',
@@ -1278,8 +1281,8 @@ class ParticlePanel(AppShell):
else:
path = '.'
if not os.path.isdir(path):
- print 'ParticlePanel Warning: Invalid default DNA directory!'
- print 'Using current directory'
+ print('ParticlePanel Warning: Invalid default DNA directory!')
+ print('Using current directory')
path = '.'
particleFilename = asksaveasfilename(
defaultextension = '.ptf',
diff --git a/direct/src/tkpanels/Placer.py b/direct/src/tkpanels/Placer.py
index 9b52343bf7..8cda08310b 100644
--- a/direct/src/tkpanels/Placer.py
+++ b/direct/src/tkpanels/Placer.py
@@ -9,7 +9,6 @@ from direct.tkwidgets.AppShell import *
from direct.tkwidgets import Dial
from direct.tkwidgets import Floater
from direct.directtools.DirectGlobals import ZERO_VEC, UNIT_VEC
-from Tkinter import *
import Pmw
"""
@@ -770,12 +769,12 @@ class Placer(AppShell):
posString = '%.2f, %.2f, %.2f' % (pos[0], pos[1], pos[2])
hprString = '%.2f, %.2f, %.2f' % (hpr[0], hpr[1], hpr[2])
scaleString = '%.2f, %.2f, %.2f' % (scale[0], scale[1], scale[2])
- print 'NodePath: %s' % name
- print 'Pos: %s' % posString
- print 'Hpr: %s' % hprString
- print 'Scale: %s' % scaleString
- print ('%s.setPosHprScale(%s, %s, %s)' %
- (name, posString, hprString, scaleString))
+ print('NodePath: %s' % name)
+ print('Pos: %s' % posString)
+ print('Hpr: %s' % hprString)
+ print('Scale: %s' % scaleString)
+ print(('%s.setPosHprScale(%s, %s, %s)' %
+ (name, posString, hprString, scaleString)))
def onDestroy(self, event):
# Remove hooks
diff --git a/direct/src/tkpanels/TaskManagerPanel.py b/direct/src/tkpanels/TaskManagerPanel.py
index 8030f06c2a..1283044b59 100644
--- a/direct/src/tkpanels/TaskManagerPanel.py
+++ b/direct/src/tkpanels/TaskManagerPanel.py
@@ -3,9 +3,16 @@
__all__ = ['TaskManagerPanel', 'TaskManagerWidget']
from direct.tkwidgets.AppShell import *
-from Tkinter import *
from direct.showbase.DirectObject import DirectObject
-import Pmw
+import Pmw, sys
+
+if sys.version_info >= (3, 0):
+ from tkinter import *
+ from tkinter.messagebox import askokcancel
+else:
+ from Tkinter import *
+ from tkMessageBox import askokcancel
+
class TaskManagerPanel(AppShell):
# Override class variables here
@@ -188,7 +195,6 @@ class TaskManagerWidget(DirectObject):
(name == 'tkLoop') or
(name == 'eventManager') or
(name == 'igLoop')):
- from tkMessageBox import askokcancel
ok = askokcancel('TaskManagerControls',
'Remove: %s?' % name,
parent = self.parent,
@@ -205,7 +211,6 @@ class TaskManagerWidget(DirectObject):
(name == 'tkLoop') or
(name == 'eventManager') or
(name == 'igLoop')):
- from tkMessageBox import askokcancel
ok = askokcancel('TaskManagerControls',
'Remove tasks named: %s?' % name,
parent = self.parent,
diff --git a/direct/src/tkwidgets/AppShell.py b/direct/src/tkwidgets/AppShell.py
index 67a7e6b794..6c5d930976 100644
--- a/direct/src/tkwidgets/AppShell.py
+++ b/direct/src/tkwidgets/AppShell.py
@@ -9,15 +9,19 @@ __all__ = ['AppShell']
from direct.showbase.DirectObject import DirectObject
from direct.showbase.TkGlobal import *
-from tkFileDialog import *
-from Tkinter import *
-import Pmw
-import Dial
-import Floater
-import Slider
-import EntryScale
-import VectorWidgets
-import ProgressBar
+import Pmw, sys
+from . import Dial
+from . import Floater
+from . import Slider
+from . import EntryScale
+from . import VectorWidgets
+from . import ProgressBar
+
+if sys.version_info >= (3, 0):
+ from tkinter.filedialog import *
+else:
+ from tkFileDialog import *
+
"""
TO FIX:
@@ -318,7 +322,7 @@ class AppShell(Pmw.MegaWidget, DirectObject):
# Update kw to reflect user inputs
kw['text'] = text
# Create widget
- widget = apply(widgetClass, (parent,), kw)
+ widget = widgetClass(parent, **kw)
# Do this after so command isn't called on widget creation
widget['command'] = command
# Pack widget
@@ -475,7 +479,7 @@ class AppShell(Pmw.MegaWidget, DirectObject):
kw['menu_tearoff'] = menu_tearoff
kw['menubutton_textvariable'] = variable
# Create widget
- widget = apply(Pmw.OptionMenu, (parent,), kw)
+ widget = Pmw.OptionMenu(parent, **kw)
# Do this after so command isn't called on widget creation
widget['command'] = command
# Pack widget
@@ -502,7 +506,7 @@ class AppShell(Pmw.MegaWidget, DirectObject):
kw['scrolledlist_items'] = items
kw['entryfield_entry_state'] = state
# Create widget
- widget = apply(Pmw.ComboBox, (parent,), kw)
+ widget = Pmw.ComboBox(parent, **kw)
# Bind selection command
widget['selectioncommand'] = command
# Select first item if it exists
diff --git a/direct/src/tkwidgets/Dial.py b/direct/src/tkwidgets/Dial.py
index 13a3cc8472..5b10cdb95a 100644
--- a/direct/src/tkwidgets/Dial.py
+++ b/direct/src/tkwidgets/Dial.py
@@ -6,10 +6,9 @@ Dial Class: Velocity style controller for floating point values with
__all__ = ['Dial', 'AngleDial', 'DialWidget']
from direct.showbase.TkGlobal import *
-from Tkinter import *
-from Valuator import Valuator, VALUATOR_MINI, VALUATOR_FULL
+from .Valuator import Valuator, VALUATOR_MINI, VALUATOR_FULL
from direct.task import Task
-import math, string, operator, Pmw
+import math, operator, Pmw
TWO_PI = 2.0 * math.pi
ONEPOINTFIVE_PI = 1.5 * math.pi
@@ -258,7 +257,7 @@ class DialWidget(Pmw.MegaWidget):
value = self['base'] + ((value - self['base']) % self['delta'])
# Send command if any
if fCommand and (self['command'] != None):
- apply(self['command'], [value] + self['commandData'])
+ self['command'](*[value] + self['commandData'])
# Record value
self.value = value
@@ -411,12 +410,12 @@ class DialWidget(Pmw.MegaWidget):
def _onButtonPress(self, *args):
""" User redefinable callback executed on button press """
if self['preCallback']:
- apply(self['preCallback'], self['callbackData'])
+ self['preCallback'](*self['callbackData'])
def _onButtonRelease(self, *args):
""" User redefinable callback executed on button release """
if self['postCallback']:
- apply(self['postCallback'], self['callbackData'])
+ self['postCallback'](*self['callbackData'])
if __name__ == '__main__':
diff --git a/direct/src/tkwidgets/EntryScale.py b/direct/src/tkwidgets/EntryScale.py
index e4c8a96a60..c9685fcf6c 100644
--- a/direct/src/tkwidgets/EntryScale.py
+++ b/direct/src/tkwidgets/EntryScale.py
@@ -5,10 +5,14 @@ EntryScale Class: Scale with a label, and a linked and validated entry
__all__ = ['EntryScale', 'EntryScaleGroup']
from direct.showbase.TkGlobal import *
-from Tkinter import *
-import string, Pmw
-import tkColorChooser
-from tkSimpleDialog import *
+import Pmw, sys
+
+if sys.version_info >= (3, 0):
+ from tkinter.simpledialog import *
+ from tkinter.colorchooser import askcolor
+else:
+ from tkSimpleDialog import *
+ from tkColorChooser import askcolor
"""
Change Min/Max buttons to labels, add highlight binding
@@ -204,7 +208,7 @@ class EntryScale(Pmw.MegaWidget):
if not self.fScaleCommand:
return
# convert scale val to float
- self.set(string.atof(strVal))
+ self.set(float(strVal))
"""
# Update entry to reflect formatted value
self.entryValue.set(self.entryFormat % self.value)
@@ -215,10 +219,10 @@ class EntryScale(Pmw.MegaWidget):
def _entryCommand(self, event = None):
try:
- val = string.atof(self.entryValue.get())
- apply(self.onReturn, self['callbackData'])
+ val = float(self.entryValue.get())
+ self.onReturn(*self['callbackData'])
self.set(val)
- apply(self.onReturnRelease, self['callbackData'])
+ self.onReturnRelease(*self['callbackData'])
except ValueError:
pass
@@ -266,7 +270,7 @@ class EntryScale(Pmw.MegaWidget):
def __onPress(self, event):
# First execute onpress callback
if self['preCallback']:
- apply(self['preCallback'], self['callbackData'])
+ self['preCallback'](*self['callbackData'])
# Now enable slider command
self.fScaleCommand = 1
@@ -279,7 +283,7 @@ class EntryScale(Pmw.MegaWidget):
self.fScaleCommand = 0
# First execute onpress callback
if self['postCallback']:
- apply(self['postCallback'], self['callbackData'])
+ self['postCallback'](*self['callbackData'])
def onRelease(self, *args):
""" User redefinable callback executed on button release """
@@ -417,7 +421,7 @@ class EntryScaleGroup(Pmw.MegaToplevel):
def __onReturn(self, esg):
# Execute onReturn callback
- apply(self.onReturn, esg.get())
+ self.onReturn(*esg.get())
def onReturn(self, *args):
""" User redefinable callback executed on button press """
@@ -425,7 +429,7 @@ class EntryScaleGroup(Pmw.MegaToplevel):
def __onReturnRelease(self, esg):
# Execute onReturnRelease callback
- apply(self.onReturnRelease, esg.get())
+ self.onReturnRelease(*esg.get())
def onReturnRelease(self, *args):
""" User redefinable callback executed on button press """
@@ -434,7 +438,7 @@ class EntryScaleGroup(Pmw.MegaToplevel):
def __onPress(self, esg):
# Execute onPress callback
if self['preCallback']:
- apply(self['preCallback'], esg.get())
+ self['preCallback'](*esg.get())
def onPress(self, *args):
""" User redefinable callback executed on button press """
@@ -443,7 +447,7 @@ class EntryScaleGroup(Pmw.MegaToplevel):
def __onRelease(self, esg):
# Execute onRelease callback
if self['postCallback']:
- apply(self['postCallback'], esg.get())
+ self['postCallback'](*esg.get())
def onRelease(self, *args):
""" User redefinable callback executed on button release """
@@ -492,7 +496,7 @@ def rgbPanel(nodePath, callback = None):
# System color picker
def popupColorPicker(esg = esg):
# Can pass in current color with: color = (255, 0, 0)
- color = tkColorChooser.askcolor(
+ color = askcolor(
parent = esg.interior(),
# Initialize it to current color
initialcolor = tuple(esg.get()[:3]))[0]
@@ -502,7 +506,7 @@ def rgbPanel(nodePath, callback = None):
command = popupColorPicker)
def printToLog(nodePath=nodePath):
c=nodePath.getColor()
- print "Vec4(%.3f, %.3f, %.3f, %.3f)"%(c[0], c[1], c[2], c[3])
+ print("Vec4(%.3f, %.3f, %.3f, %.3f)"%(c[0], c[1], c[2], c[3]))
menu.insert_command(index = 5, label = 'Print to log',
command = printToLog)
@@ -520,7 +524,7 @@ if __name__ == '__main__':
# Dummy command
def printVal(val):
- print val
+ print(val)
# Create and pack a EntryScale megawidget.
mega1 = EntryScale(root, command = printVal)
diff --git a/direct/src/tkwidgets/Floater.py b/direct/src/tkwidgets/Floater.py
index 655b7728be..d8a1b83534 100644
--- a/direct/src/tkwidgets/Floater.py
+++ b/direct/src/tkwidgets/Floater.py
@@ -6,8 +6,7 @@ Floater Class: Velocity style controller for floating point values with
__all__ = ['Floater', 'FloaterWidget', 'FloaterGroup']
from direct.showbase.TkGlobal import *
-from Tkinter import *
-from Valuator import Valuator, VALUATOR_MINI, VALUATOR_FULL
+from .Valuator import Valuator, VALUATOR_MINI, VALUATOR_FULL
from direct.task import Task
import math, Pmw
@@ -123,7 +122,7 @@ class FloaterWidget(Pmw.MegaWidget):
"""
# Send command if any
if fCommand and (self['command'] != None):
- apply(self['command'], [value] + self['commandData'])
+ self['command'](*[value] + self['commandData'])
# Record value
self.value = value
@@ -145,7 +144,7 @@ class FloaterWidget(Pmw.MegaWidget):
# Exectute user redefinable callback function (if any)
self['relief'] = SUNKEN
if self['preCallback']:
- apply(self['preCallback'], self['callbackData'])
+ self['preCallback'](*self['callbackData'])
self.velocitySF = 0.0
self.updateTask = taskMgr.add(self.updateFloaterTask,
'updateFloater')
@@ -183,7 +182,7 @@ class FloaterWidget(Pmw.MegaWidget):
self.velocitySF = 0.0
# Execute user redefinable callback function (if any)
if self['postCallback']:
- apply(self['postCallback'], self['callbackData'])
+ self['postCallback'](*self['callbackData'])
self['relief'] = RAISED
def setNumDigits(self):
@@ -336,7 +335,7 @@ if __name__ == '__main__':
# Dummy command
def printVal(val):
- print val
+ print(val)
# Create and pack a Floater megawidget.
mega1 = Floater(root, command = printVal)
diff --git a/direct/src/tkwidgets/MemoryExplorer.py b/direct/src/tkwidgets/MemoryExplorer.py
index 325e95b74d..62e74a6202 100755
--- a/direct/src/tkwidgets/MemoryExplorer.py
+++ b/direct/src/tkwidgets/MemoryExplorer.py
@@ -1,7 +1,6 @@
from direct.showbase.DirectObject import DirectObject
from direct.showbase.TkGlobal import *
-from Tkinter import *
-from Tree import *
+from .Tree import *
import Pmw
#--------------------------------------------------------------------------
diff --git a/direct/src/tkwidgets/ProgressBar.py b/direct/src/tkwidgets/ProgressBar.py
index d9ed5d3824..81b1d480b3 100644
--- a/direct/src/tkwidgets/ProgressBar.py
+++ b/direct/src/tkwidgets/ProgressBar.py
@@ -5,7 +5,7 @@ A basic widget for showing the progress being made in a task.
__all__ = ['ProgressBar']
from direct.showbase.TkGlobal import *
-from Tkinter import *
+
class ProgressBar:
def __init__(self, master=None, orientation="horizontal",
diff --git a/direct/src/tkwidgets/SceneGraphExplorer.py b/direct/src/tkwidgets/SceneGraphExplorer.py
index 2c5c965056..7e39dbeac1 100644
--- a/direct/src/tkwidgets/SceneGraphExplorer.py
+++ b/direct/src/tkwidgets/SceneGraphExplorer.py
@@ -4,8 +4,7 @@ __all__ = ['SceneGraphExplorer', 'SceneGraphExplorerItem', 'explore']
from direct.showbase.DirectObject import DirectObject
from direct.showbase.TkGlobal import *
-from Tkinter import *
-from Tree import *
+from .Tree import *
import Pmw
# changing these strings requires changing DirectSession.py SGE_ strs too!
diff --git a/direct/src/tkwidgets/Slider.py b/direct/src/tkwidgets/Slider.py
index f2d9bb1246..ceb36287d3 100644
--- a/direct/src/tkwidgets/Slider.py
+++ b/direct/src/tkwidgets/Slider.py
@@ -6,9 +6,7 @@ Slider Class: Velocity style controller for floating point values with
__all__ = ['Slider', 'SliderWidget', 'rgbPanel']
from direct.showbase.TkGlobal import *
-from Tkinter import *
-from Valuator import Valuator, rgbPanel, VALUATOR_MINI, VALUATOR_FULL
-import string
+from .Valuator import Valuator, rgbPanel, VALUATOR_MINI, VALUATOR_FULL
import Pmw
class Slider(Valuator):
@@ -282,7 +280,7 @@ class SliderWidget(Pmw.MegaWidget):
"""
# Send command if any
if fCommand and (self['command'] != None):
- apply(self['command'], [value] + self['commandData'])
+ self['command'](*[value] + self['commandData'])
# Record value
self.value = value
@@ -322,11 +320,11 @@ class SliderWidget(Pmw.MegaWidget):
# Find screen space position of bottom/center of arrow button
x = (self._arrowBtn.winfo_rootx() + self._arrowBtn.winfo_width()/2.0 -
self.interior()['bd'])
-# string.atoi(self.interior()['bd']))
+# int(self.interior()['bd']))
y = self._arrowBtn.winfo_rooty() + self._arrowBtn.winfo_height()
# Popup border width
bd = self._popup['bd']
-# bd = string.atoi(self._popup['bd'])
+# bd = int(self._popup['bd'])
# Get width of label
minW = self._minLabel.winfo_width()
# Width of canvas to adjust for
@@ -378,7 +376,7 @@ class SliderWidget(Pmw.MegaWidget):
self._fPressInside = 1
self._fUpdate = 1
if self['preCallback']:
- apply(self['preCallback'], self['callbackData'])
+ self['preCallback'](*self['callbackData'])
self._updateValue(event)
else:
self._fPressInside = 0
@@ -391,24 +389,24 @@ class SliderWidget(Pmw.MegaWidget):
if canvasY > 0:
self._fUpdate = 1
if self['preCallback']:
- apply(self['preCallback'], self['callbackData'])
+ self['preCallback'](*self['callbackData'])
self._unpostOnNextRelease()
elif self._fUpdate:
self._updateValue(event)
def _scaleBtnPress(self, event):
if self['preCallback']:
- apply(self['preCallback'], self['callbackData'])
+ self['preCallback'](*self['callbackData'])
def _scaleBtnRelease(self, event):
# Do post callback if any
if self['postCallback']:
- apply(self['postCallback'], self['callbackData'])
+ self['postCallback'](*self['callbackData'])
def _widgetBtnRelease(self, event):
# Do post callback if any
if self._fUpdate and self['postCallback']:
- apply(self['postCallback'], self['callbackData'])
+ self['postCallback'](*self['callbackData'])
if (self._fUnpost or
(not (self._firstPress or self._fPressInside))):
self._unpostSlider()
@@ -460,7 +458,7 @@ class SliderWidget(Pmw.MegaWidget):
self._widget['command'] = self._scaleCommand
def _scaleCommand(self, val):
- self.set(string.atof(val))
+ self.set(float(val))
# Methods to modify floater characteristics
def setMin(self):
diff --git a/direct/src/tkwidgets/Tree.py b/direct/src/tkwidgets/Tree.py
index 88d3918386..e3e49b925f 100644
--- a/direct/src/tkwidgets/Tree.py
+++ b/direct/src/tkwidgets/Tree.py
@@ -21,7 +21,6 @@ __all__ = ['TreeNode', 'TreeItem']
import os
from direct.showbase.TkGlobal import *
-from Tkinter import *
from panda3d.core import *
# Initialize icon directory
@@ -233,7 +232,7 @@ class TreeNode:
self.kidKeys.append(key)
# Remove unused children
- for key in self.children.keys():
+ for key in list(self.children.keys()):
if key not in self.kidKeys:
del(self.children[key])
@@ -304,14 +303,14 @@ class TreeNode:
if self.fModeChildrenTag:
if self.childrenTag:
showThisItem = False
- for tagKey in self.childrenTag.keys():
+ for tagKey in list(self.childrenTag.keys()):
if item.nodePath.hasTag(tagKey):
showThisItem = self.childrenTag[tagKey]
if not showThisItem:
self.kidKeys.remove(key)
# Remove unused children
- for key in self.children.keys():
+ for key in list(self.children.keys()):
if key not in self.kidKeys:
del(self.children[key])
cx = x+20
@@ -437,7 +436,7 @@ class TreeNode:
if self.fModeChildrenTag:
if self.childrenTag:
showThisItem = False
- for tagKey in self.childrenTag.keys():
+ for tagKey in list(self.childrenTag.keys()):
if self.item.nodePath.hasTag(tagKey):
showThisItem = self.childrenTag[tagKey]
if not showThisItem:
diff --git a/direct/src/tkwidgets/Valuator.py b/direct/src/tkwidgets/Valuator.py
index 652640a8cf..8b88d98680 100644
--- a/direct/src/tkwidgets/Valuator.py
+++ b/direct/src/tkwidgets/Valuator.py
@@ -4,12 +4,15 @@ __all__ = ['Valuator', 'ValuatorGroup', 'ValuatorGroupPanel']
from direct.showbase.DirectObject import *
from direct.showbase.TkGlobal import *
-from Tkinter import *
-import tkColorChooser
-import WidgetPropertiesDialog
-import string, Pmw
+from . import WidgetPropertiesDialog
+import Pmw
from direct.directtools.DirectUtil import getTkColorString
+if sys.version_info >= (3, 0):
+ from tkinter.colorchooser import askcolor
+else:
+ from tkColorChooser import askcolor
+
VALUATOR_MINI = 'mini'
VALUATOR_FULL = 'full'
@@ -204,7 +207,7 @@ class Valuator(Pmw.MegaWidget):
self._valuator.updateIndicator(value)
# Execute command if required
if fCommand and self.fInit and (self['command'] is not None):
- apply(self['command'], [value] + self['commandData'])
+ self['command'](*[value] + self['commandData'])
# Record adjusted value
self.adjustedValue = value
# Once initialization is finished, allow commands to execute
@@ -228,7 +231,7 @@ class Valuator(Pmw.MegaWidget):
# Reset background
self._entry.configure(background = self._entryBackground)
# Get new value and check validity
- newValue = string.atof(input)
+ newValue = float(input)
# If OK, execute preCallback if one defined
self._preCallback()
# Call set to update valuator
@@ -259,12 +262,12 @@ class Valuator(Pmw.MegaWidget):
# Callback functions
def _preCallback(self):
if self['preCallback']:
- apply(self['preCallback'], self['callbackData'])
+ self['preCallback'](*self['callbackData'])
def _postCallback(self):
# Exectute post callback if one defined
if self['postCallback']:
- apply(self['postCallback'], self['callbackData'])
+ self['postCallback'](*self['callbackData'])
def setState(self):
""" Enable/disable widget """
@@ -391,16 +394,16 @@ class ValuatorGroup(Pmw.MegaWidget):
# Add a group alias so you can configure the valuators via:
# fg.configure(Valuator_XXX = YYY)
if self['type'] == DIAL:
- import Dial
+ from . import Dial
valuatorType = Dial.Dial
elif self['type'] == ANGLEDIAL:
- import Dial
+ from . import Dial
valuatorType = Dial.AngleDial
elif self['type'] == SLIDER:
- import Slider
+ from . import Slider
valuatorType = Slider.Slider
else:
- import Floater
+ from . import Floater
valuatorType = Floater.Floater
f = self.createcomponent(
'valuator%d' % index, (), 'valuator', valuatorType,
@@ -459,12 +462,12 @@ class ValuatorGroup(Pmw.MegaWidget):
def _preCallback(self, valGroup):
# Execute pre callback
if self['preCallback']:
- apply(self['preCallback'], valGroup.get())
+ self['preCallback'](*valGroup.get())
def _postCallback(self, valGroup):
# Execute post callback
if self['postCallback']:
- apply(self['postCallback'], valGroup.get())
+ self['postCallback'](*valGroup.get())
def __len__(self):
return self['dim']
@@ -607,7 +610,7 @@ def rgbPanel(nodePath, callback = None, style = 'mini'):
def popupColorPicker():
# Can pass in current color with: color = (255, 0, 0)
- color = tkColorChooser.askcolor(
+ color = askcolor(
parent = vgp.interior(),
# Initialize it to current color
initialcolor = tuple(vgp.get()[:3]))[0]
@@ -616,7 +619,7 @@ def rgbPanel(nodePath, callback = None, style = 'mini'):
def printToLog():
c=nodePath.getColor()
- print "Vec4(%.3f, %.3f, %.3f, %.3f)"%(c[0], c[1], c[2], c[3])
+ print("Vec4(%.3f, %.3f, %.3f, %.3f)"%(c[0], c[1], c[2], c[3]))
# Check init color
if nodePath.hasColor():
@@ -689,7 +692,7 @@ def lightRGBPanel(light, style = 'mini'):
# Color picker for lights
def popupColorPicker():
# Can pass in current color with: color = (255, 0, 0)
- color = tkColorChooser.askcolor(
+ color = askcolor(
parent = vgp.interior(),
# Initialize it to current color
initialcolor = tuple(vgp.get()[:3]))[0]
@@ -698,8 +701,8 @@ def lightRGBPanel(light, style = 'mini'):
def printToLog():
n = light.getName()
c=light.getColor()
- print n + (".setColor(Vec4(%.3f, %.3f, %.3f, %.3f))" %
- (c[0], c[1], c[2], c[3]))
+ print(n + (".setColor(Vec4(%.3f, %.3f, %.3f, %.3f))" %
+ (c[0], c[1], c[2], c[3])))
# Check init color
initColor = light.getColor() * 255.0
# Create entry scale group
diff --git a/direct/src/tkwidgets/VectorWidgets.py b/direct/src/tkwidgets/VectorWidgets.py
index 8fa64d31d9..1edfa951dd 100644
--- a/direct/src/tkwidgets/VectorWidgets.py
+++ b/direct/src/tkwidgets/VectorWidgets.py
@@ -3,14 +3,15 @@
__all__ = ['VectorEntry', 'Vector2Entry', 'Vector3Entry', 'Vector4Entry', 'ColorEntry']
from direct.showbase.TkGlobal import *
-from Tkinter import *
-import Valuator
-import Floater
-import Slider
-import string
-import tkColorChooser
-import types
+from . import Valuator
import Pmw
+import sys
+
+if sys.version_info >= (3, 0):
+ from tkinter.colorchooser import askcolor
+else:
+ from tkColorChooser import askcolor
+
class VectorEntry(Pmw.MegaWidget):
def __init__(self, parent = None, **kw):
@@ -176,7 +177,7 @@ class VectorEntry(Pmw.MegaWidget):
return self._value[index]
def set(self, value, fCommand = 1):
- if type(value) in (types.FloatType, types.IntType, types.LongType):
+ if type(value) in (float, int):
value = [value] * self['dim']
for i in range(self['dim']):
self._value[i] = value[i]
@@ -192,7 +193,7 @@ class VectorEntry(Pmw.MegaWidget):
entryVar = self.variableList[index]
# Did we get a valid float?
try:
- newVal = string.atof(entryVar.get())
+ newVal = float(entryVar.get())
except ValueError:
return
@@ -330,7 +331,7 @@ class ColorEntry(VectorEntry):
def popupColorPicker(self):
# Can pass in current color with: color = (255, 0, 0)
- color = tkColorChooser.askcolor(
+ color = askcolor(
parent = self.interior(),
# Initialize it to current color
initialcolor = tuple(self.get()[:3]))[0]
diff --git a/direct/src/tkwidgets/WidgetPropertiesDialog.py b/direct/src/tkwidgets/WidgetPropertiesDialog.py
index 6418d89c0a..0693a885d1 100644
--- a/direct/src/tkwidgets/WidgetPropertiesDialog.py
+++ b/direct/src/tkwidgets/WidgetPropertiesDialog.py
@@ -3,8 +3,7 @@
__all__ = ['WidgetPropertiesDialog']
from direct.showbase.TkGlobal import *
-from Tkinter import *
-import types, string, Pmw
+import Pmw, sys
"""
TODO:
@@ -28,12 +27,16 @@ class WidgetPropertiesDialog(Toplevel):
self.propertyDict = propertyDict
self.propertyList = propertyList
if self.propertyList is None:
- self.propertyList = self.propertyDict.keys()
+ self.propertyList = list(self.propertyDict.keys())
self.propertyList.sort()
# Use default parent if none specified
if not parent:
- import Tkinter
- parent = Tkinter._default_root
+ if sys.version_info >= (3, 0):
+ import tkinter
+ parent = tkinter._default_root
+ else:
+ import Tkinter
+ parent = Tkinter._default_root
# Create toplevel window
Toplevel.__init__(self, parent)
self.transient(parent)
@@ -172,8 +175,8 @@ class WidgetPropertiesDialog(Toplevel):
box.pack()
def realOrNone(self, val):
- val = string.lower(val)
- if string.find('none', val) != -1:
+ val = val.lower()
+ if 'none'.find(val) != -1:
if val == 'none':
return Pmw.OK
else:
@@ -181,8 +184,8 @@ class WidgetPropertiesDialog(Toplevel):
return Pmw.realvalidator(val)
def intOrNone(self, val):
- val = string.lower(val)
- if string.find('none', val) != -1:
+ val = val.lower()
+ if 'none'.find(val) != -1:
if val == 'none':
return Pmw.OK
else:
@@ -204,22 +207,22 @@ class WidgetPropertiesDialog(Toplevel):
self.destroy()
def validateChanges(self):
- for property in self.modifiedDict.keys():
+ for property in self.modifiedDict:
tuple = self.modifiedDict[property]
widget = tuple[0]
entry = tuple[1]
type = tuple[2]
fNone = tuple[3]
value = entry.get()
- lValue = string.lower(value)
- if (string.find('none', lValue) != -1):
+ lValue = value.lower()
+ if 'none'.find(lValue) != -1:
if fNone and (lValue == 'none'):
widget[property] = None
else:
if type == 'real':
- value = string.atof(value)
+ value = float(value)
elif type == 'integer':
- value = string.atoi(value)
+ value = int(value)
widget[property] = value
def apply(self):
diff --git a/direct/src/wxwidgets/ViewPort.py b/direct/src/wxwidgets/ViewPort.py
index 19ed102330..57d7d4fc13 100755
--- a/direct/src/wxwidgets/ViewPort.py
+++ b/direct/src/wxwidgets/ViewPort.py
@@ -12,7 +12,7 @@ from direct.showbase.DirectObject import DirectObject
from direct.directtools.DirectGrid import DirectGrid
from direct.showbase.ShowBase import WindowControls
from direct.directtools.DirectGlobals import *
-from WxPandaWindow import WxPandaWindow
+from .WxPandaWindow import WxPandaWindow
from panda3d.core import OrthographicLens, Point3, Plane, CollisionPlane, CollisionNode, NodePath
import wx
diff --git a/direct/src/wxwidgets/WxPandaShell.py b/direct/src/wxwidgets/WxPandaShell.py
index 128eea64b4..cae5fb9332 100755
--- a/direct/src/wxwidgets/WxPandaShell.py
+++ b/direct/src/wxwidgets/WxPandaShell.py
@@ -10,8 +10,8 @@ try:
except NameError:
base = ShowBase(False, windowType = 'none')
-from WxAppShell import *
-from ViewPort import *
+from .WxAppShell import *
+from .ViewPort import *
ID_FOUR_VIEW = 401
ID_TOP_VIEW = 402
diff --git a/direct/src/wxwidgets/WxPandaStart.py b/direct/src/wxwidgets/WxPandaStart.py
index 015181144b..80cd385bf1 100755
--- a/direct/src/wxwidgets/WxPandaStart.py
+++ b/direct/src/wxwidgets/WxPandaStart.py
@@ -1,3 +1,3 @@
-from WxPandaShell import *
+from .WxPandaShell import *
base.app = WxPandaShell()
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 71845db7b8..4dae961c0d 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -2621,26 +2621,7 @@ CreatePandaVersionFiles()
##########################################################################################
if (PkgSkip("DIRECT")==0):
- fixers = [
- 'apply',
- 'callable',
- 'dict',
- 'except',
- 'execfile',
- 'import',
- 'imports',
- 'long',
- 'metaclass',
- 'next',
- 'numliterals',
- 'print',
- 'types',
- 'unicode',
- 'xrange',
- 'xreadlines',
- ]
-
- CopyPythonTree(GetOutputDir() + '/direct', 'direct/src', lib2to3_fixers=fixers, threads=THREADCOUNT)
+ CopyPythonTree(GetOutputDir() + '/direct', 'direct/src', threads=THREADCOUNT)
ConditionalWriteFile(GetOutputDir() + '/direct/__init__.py', "")
# This file used to be copied, but would nowadays cause conflicts.