General: Python3 update

.gitignore

@@ -22,3 +22,4 @@ pip-delete-this-directory.txt
 
 # IDEA pycharm/intellij
 .idea/
+.DS_Store

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "discord.removeRemoteRepository": true,
+    "discord.lowerDetailsEditing": "line: {current_line}"
+}

dependencies/config/general.prc

@@ -11,7 +11,7 @@ notify-level-DistributedNPCScientistAI info
 want-pstats #f
 
 # Audio:
-audio-library-name p3fmod_audio
+audio-library-name p3openal_audio
 
 # Graphics:
 aux-display pandagl

otp/ai/AIZoneData.py

@@ -42,7 +42,7 @@ def __str__(self):
         output += '\n'
         totalColliders = 0
         totalTraversers = 0
-        for currCollTrav in self._collTravs.values():
+        for currCollTrav in list(self._collTravs.values()):
             totalTraversers += 1
             totalColliders += currCollTrav.getNumColliders()
 
@@ -183,7 +183,7 @@ def __init__(self):
         self._zone2data = {}
 
     def destroy(self):
-        for zone, data in self._zone2data.items():
+        for zone, data in list(self._zone2data.items()):
             data.destroy()
 
         del self._zone2data

otp/ai/BanManagerAI.py

@@ -7,7 +7,7 @@
 from otp.ai.MagicWordGlobal import *
 from direct.showbase.DirectObject import DirectObject
 import threading
-import httplib
+import http.client
 
 class BanFSM(FSM):
 
@@ -23,7 +23,7 @@ def __init__(self, air, avId):
 
     def performBan(self):
         self.ejectPlayer()
-        print(self.accountId)
+        print((self.accountId))
 
     def ejectPlayer(self):
         av = self.air.doId2do.get(self.avId)

otp/ai/GarbageLeakServerEventAggregator.py

@@ -31,7 +31,7 @@ def _stopSending(self):
         self._doLaterName = None
 
     def _sendLeaks(self, task = None):
-        for desc, curNum in self._curLeakDesc2num.iteritems():
+        for desc, curNum in list(self._curLeakDesc2num.items()):
             self._sentLeakDesc2num.setdefault(desc, 0)
             num = curNum - self._sentLeakDesc2num[desc]
             if num > 0:

otp/ai/MagicWordGlobal.py

@@ -107,8 +107,8 @@ def __init__(self, name, func, types, access, doc):
         self.doc = doc
 
     def parseArgs(self, string):
-        maxArgs = self.func.func_code.co_argcount
-        minArgs = maxArgs - (len(self.func.func_defaults) if self.func.func_defaults else 0)
+        maxArgs = self.func.__code__.co_argcount
+        minArgs = maxArgs - (len(self.func.__defaults__) if self.func.__defaults__ else 0)
 
         args = string.split(None, maxArgs-1)[:maxArgs]
         if len(args) < minArgs:
@@ -153,7 +153,7 @@ def __call__(self, mw):
 
         name = self.name
         if name is None:
-            name = mw.func_name
+            name = mw.__name__
 
         word = MagicWord(name, mw, self.types, self.access, mw.__doc__)
         spellbook.addWord(word)

otp/ai/MagicWordManagerAI.py

@@ -49,7 +49,7 @@ def sendMagicWord(self, word, targetId):
         if not os.path.exists('user/logs/mw'):
             os.makedirs('user/logs/mw')
 
-        print("%s | %s : %s\n" % (now, invokerId, word))
+        print(("%s | %s : %s\n" % (now, invokerId, word)))
 
         if os.getenv('DISTRICT_NAME', 'Test Canvas') == "Test Canvas":
             return
@@ -60,7 +60,7 @@ def sendMagicWord(self, word, targetId):
 
 @magicWord(category=CATEGORY_COMMUNITY_MANAGER, types=[str])
 def help(wordName=None):
-    print 'help called with %s' % (wordName)
+    print(('help called with %s' % (wordName)))
     if not wordName:
         return "What were you interested getting help for?"
     word = spellbook.words.get(wordName.lower())   # look it up by its lower case value

otp/ai/TimeManager.py

@@ -272,7 +272,7 @@ def d_setFrameRate(self, fps, deviation, numAvs, locationCode, timeInLocation, t
          '%0.03f,%0.03f' % cpuSpeed,
          '%d,%d' % (numCpuCores, numLogicalCpus),
          apiName)
-        print 'frame rate: %s' % info
+        print(('frame rate: %s' % info))
         self.sendUpdate('setFrameRate', [fps,
          deviation,
          numAvs,
@@ -337,7 +337,7 @@ def getMacOsInfo(self, defaultOsInfo):
                      bugfix,
                      major,
                      minor)
-                except Exception, e:
+                except Exception as e:
                     self.notify.debug('getMacOsInfo %s' % str(e))
 
         self.notify.debug('getMacOsInfo returning %s' % str(result))

otp/avatar/DistributedAvatar.py

@@ -4,7 +4,7 @@
 from toontown.toonbase import ToonPythonUtil as PythonUtil
 from direct.task import Task
 from pandac.PandaModules import *
-from Avatar import Avatar
+from .Avatar import Avatar
 from otp.ai.MagicWordGlobal import *
 from otp.otpbase import OTPGlobals
 from toontown.battle.BattleProps import globalPropPool

otp/avatar/DistributedPlayer.py

@@ -136,10 +136,10 @@ def setSystemMessage(self, aboutId, chatString, whisperType = WTSystem):
         self.displayWhisper(aboutId, chatString, whisperType)
 
     def displayWhisper(self, fromId, chatString, whisperType):
-        print 'Whisper type %s from %s: %s' % (whisperType, fromId, chatString)
+        print(('Whisper type %s from %s: %s' % (whisperType, fromId, chatString)))
 
     def displayWhisperPlayer(self, playerId, chatString, whisperType):
-        print 'WhisperPlayer type %s from %s: %s' % (whisperType, playerId, chatString)
+        print(('WhisperPlayer type %s from %s: %s' % (whisperType, playerId, chatString)))
 
     def whisperSCTo(self, msgIndex, sendToId, toPlayer):
         messenger.send('wakeup')
@@ -239,7 +239,7 @@ def setTalkWhisper(self, fromAV, fromAC, avatarName, chat, mods, flags):
         base.talkAssistant.receiveWhisperTalk(fromAV, avatarName, fromAC, None, self.doId, self.getName(), newText, scrubbed)
 
     def displayTalkWhisper(self, fromId, avatarName, chatString, mods):
-        print 'TalkWhisper from %s: %s' % (fromId, chatString)
+        print(('TalkWhisper from %s: %s' % (fromId, chatString)))
 
     def scrubTalk(self, chat, mods):
         return chat

otp/avatar/DistributedPlayerAI.py

@@ -278,7 +278,7 @@ def accessLevel(accessLevel, storage='PERSISTENT', showGM=1):
         if accessLevel not in accessName2Id:
             return 'Invalid access level!'
         accessLevel = accessName2Id[accessLevel]
-    if accessLevel not in accessName2Id.values():
+    if accessLevel not in list(accessName2Id.values()):
         return 'Invalid access level!'
     target = spellbook.getTarget()
     invoker = spellbook.getInvoker()

otp/avatar/Emote.py

@@ -10,7 +10,7 @@ def __init__(self):
         return
 
     def isEnabled(self, index):
-        if isinstance(index, types.StringType):
+        if isinstance(index, bytes):
             index = OTPLocalizer.EmoteFuncDict[index]
         if self.emoteFunc == None:
             return 0

otp/avatar/LocalAvatar.py

@@ -591,22 +591,7 @@ def removeCameraPosition(self):
                 self.cameraPositions.remove(camPos)
             self.nextCameraPos(1)
 
-    def printCameraPositions(self):
-        print '['
-        for i in xrange(len(self.cameraPositions)):
-            self.printCameraPosition(i)
-            print ','
-
-        print ']'
-
-    def printCameraPosition(self, index):
-        cp = self.cameraPositions[index]
-        print '(Point3(%0.2f, %0.2f, %0.2f),' % (cp[0][0], cp[0][1], cp[0][2])
-        print 'Point3(%0.2f, %0.2f, %0.2f),' % (cp[1][0], cp[1][1], cp[1][2])
-        print 'Point3(%0.2f, %0.2f, %0.2f),' % (cp[2][0], cp[2][1], cp[2][2])
-        print 'Point3(%0.2f, %0.2f, %0.2f),' % (cp[3][0], cp[3][1], cp[3][2])
-        print '%d,' % cp[4]
-        print ')',
+
 
     def posCamera(self, lerp, time):
         if not lerp:
@@ -1165,7 +1150,7 @@ def printCamPos(self):
         node = base.camera.getParent()
         pos = base.cam.getPos(node)
         hpr = base.cam.getHpr(node)
-        print 'cam pos = ', `pos`, ', cam hpr = ', `hpr`
+        print('cam pos = ', repr(pos), ', cam hpr = ', repr(hpr))
 
     def d_broadcastPositionNow(self):
         self.d_clearSmoothing()
@@ -1232,7 +1217,7 @@ def d_setParent(self, parentToken):
         DistributedSmoothNode.DistributedSmoothNode.d_setParent(self, parentToken)
 
     def handlePlayerFriendWhisper(self, playerId, charMessage):
-        print 'handlePlayerFriendWhisper'
+        print('handlePlayerFriendWhisper')
         self.displayWhisperPlayer(playerId, charMessage, WTNormal)
 
     def canChat(self):

otp/chat/ChatAgentAI.py

@@ -6,7 +6,7 @@
 from direct.distributed.MsgTypes import *
 from time import gmtime, strftime
 import json
-import httplib
+import http.client
 import six
 
 def to_bool(boolorstr):
@@ -58,7 +58,7 @@ def chatMessage(self, message, fakeChatMode):
         self.sendUpdate('chatMessageAiToUd', [sender, message, chatMode])
 
     def chatMessageResponse(self, sender, message, modifications, chatMode):
-        if sender not in self.air.doId2do.keys():
+        if sender not in list(self.air.doId2do.keys()):
             # found an invalid sender!
             return
 

otp/chat/ChatGarbler.py

@@ -8,7 +8,7 @@ def garble(self, avatar, message):
         newMessage = ''
         numWords = random.randint(1, 7)
         wordlist = OTPLocalizer.ChatGarblerDefault
-        for i in xrange(1, numWords + 1):
+        for i in range(1, numWords + 1):
             wordIndex = random.randint(0, len(wordlist) - 1)
             newMessage = newMessage + wordlist[wordIndex]
             if i < numWords:
@@ -20,7 +20,7 @@ def garbleSingle(self, avatar, message):
         newMessage = ''
         numWords = 1
         wordlist = OTPLocalizer.ChatGarblerDefault
-        for i in xrange(1, numWords + 1):
+        for i in range(1, numWords + 1):
             wordIndex = random.randint(0, len(wordlist) - 1)
             newMessage = newMessage + wordlist[wordIndex]
             if i < numWords:

otp/chat/TalkAssistant.py

@@ -229,12 +229,12 @@ def fillWithTestText(self):
         self.floodThreshold = hold
 
     def printHistoryComplete(self):
-        print 'HISTORY COMPLETE'
+        print('HISTORY COMPLETE')
         for message in self.historyComplete:
-            print '%s %s %s\n%s\n' % (message.getTimeStamp(),
+            print(('%s %s %s\n%s\n' % (message.getTimeStamp(),
              message.getSenderAvatarName(),
              message.getSenderAccountName(),
-             message.getBody())
+             message.getBody())))
 
     def checkOpenTypedChat(self):
         if base.localAvatar.commonChatFlags & OTPGlobals.CommonChat:
@@ -653,7 +653,7 @@ def sendGuildTalk(self, message):
         if self.checkGuildTypedChat():
             base.cr.guildManager.sendTalk(message)
         else:
-            print 'Guild chat error'
+            print('Guild chat error')
             error = ERROR_NO_GUILD_CHAT
 
         return error
@@ -722,7 +722,7 @@ def sendGuildSpeedChat(self, type, msgIndex):
         if self.checkGuildSpeedChat():
             base.cr.guildManager.sendSC(msgIndex)
         else:
-            print 'Guild Speedchat error'
+            print('Guild Speedchat error')
             error = ERROR_NO_GUILD_CHAT
         return error
 

otp/distributed/ClientRepositoryBaseOR.py

@@ -516,7 +516,7 @@ def getObjectsOfClass(self, objClass):
         """ returns dict of doId:object, containing all objects
         that inherit from 'class'. returned dict is safely mutable. """
         doDict = {}
-        for doId, do in self.doId2do.items():
+        for doId, do in list(self.doId2do.items()):
             if isinstance(do, objClass):
                 doDict[doId] = do
         return doDict
@@ -526,7 +526,7 @@ def getObjectsOfExactClass(self, objClass):
         are exactly of type 'class' (neglecting inheritance). returned
         dict is safely mutable. """
         doDict = {}
-        for doId, do in self.doId2do.items():
+        for doId, do in list(self.doId2do.items()):
             if do.__class__ == objClass:
                 doDict[doId] = do
         return doDict
@@ -604,6 +604,6 @@ def _removeDelayDeletedDO(self, do):
     def printDelayDeletes(self):
         print('DelayDeletes:')
         print('=============')
-        for obj in self._delayDeletedDOs.values():
-            print('%s\t%s (%s)\tdelayDeletes=%s' % (
-                obj.doId, safeRepr(obj), itype(obj), obj.getDelayDeleteNames()))
+        for obj in list(self._delayDeletedDOs.values()):
+            print(('%s\t%s (%s)\tdelayDeletes=%s' % (
+                obj.doId, safeRepr(obj), itype(obj), obj.getDelayDeleteNames())))

otp/distributed/ClsendTracker.py

@@ -34,7 +34,7 @@ def trackClientSendMsg(self, dataStr):
             self._trimClsend()
 
     def _trimClsend(self):
-        for i in xrange(self._clsendFlushNum):
+        for i in range(self._clsendFlushNum):
             if self._logClsendOverflow:
                 self._logClsend(*self._clsendMsgs[0])
             self._clsendMsgs = self._clsendMsgs[1:]

otp/distributed/ConnectionRepository_override.py

@@ -245,7 +245,7 @@ def readDCFile(self, dcFileNames=None):
         if not readResult:
             self.notify.error("Could not read dc file.")
         self.hashVal = dcFile.getHash()
-        for n in xrange(dcFile.getNumImportModules()):
+        for n in range(dcFile.getNumImportModules()):
             moduleName = dcFile.getImportModule(n)[:]
             suffix = moduleName.split('/')
             moduleName = suffix[0]
@@ -255,7 +255,7 @@ def readDCFile(self, dcFileNames=None):
             elif self.dcSuffix == 'UD' and 'AI' in suffix: #HACK:
                 moduleName += 'AI'
             importSymbols = []
-            for i in xrange(dcFile.getNumImportSymbols(n)):
+            for i in range(dcFile.getNumImportSymbols(n)):
                 symbolName = dcFile.getImportSymbol(n, i)
                 suffix = symbolName.split('/')
                 symbolName = suffix[0]
@@ -266,7 +266,7 @@ def readDCFile(self, dcFileNames=None):
                     symbolName += 'AI'
                 importSymbols.append(symbolName)
             self.importModule(dcImports, moduleName, importSymbols)
-        for i in xrange(dcFile.getNumClasses()):
+        for i in range(dcFile.getNumClasses()):
             dclass = dcFile.getClass(i)
             number = dclass.getNumber()
             className = dclass.getName() + self.dcSuffix
@@ -286,7 +286,7 @@ def readDCFile(self, dcFileNames=None):
                         continue
                     classDef = getattr(classDef, className)
 
-                if type(classDef) != types.ClassType and type(classDef) != types.TypeType:
+                if type(classDef) != type and type(classDef) != type:
                     self.notify.error("Symbol %s is not a class name." % (className))
                 else:
                     dclass.setClassDef(classDef)
@@ -297,15 +297,15 @@ def readDCFile(self, dcFileNames=None):
         if self.hasOwnerView():
             ownerDcSuffix = self.dcSuffix + 'OV'
             ownerImportSymbols = {}
-            for n in xrange(dcFile.getNumImportModules()):
+            for n in range(dcFile.getNumImportModules()):
                 moduleName = dcFile.getImportModule(n)
                 suffix = moduleName.split('/')
                 moduleName = suffix[0]
                 suffix=suffix[1:]
                 if ownerDcSuffix in suffix:
                     moduleName = moduleName + ownerDcSuffix
                 importSymbols = []
-                for i in xrange(dcFile.getNumImportSymbols(n)):
+                for i in range(dcFile.getNumImportSymbols(n)):
                     symbolName = dcFile.getImportSymbol(n, i)
                     suffix = symbolName.split('/')
                     symbolName = suffix[0]
@@ -315,7 +315,7 @@ def readDCFile(self, dcFileNames=None):
                     importSymbols.append(symbolName)
                     ownerImportSymbols[symbolName] = None
                 self.importModule(dcImports, moduleName, importSymbols)
-            for i in xrange(dcFile.getNumClasses()):
+            for i in range(dcFile.getNumClasses()):
                 dclass = dcFile.getClass(i)
                 if ((dclass.getName()+ownerDcSuffix) in ownerImportSymbols):
                     number = dclass.getNumber()
@@ -347,7 +347,7 @@ def importModule(self, dcImports, moduleName, importSymbols):
                 if hasattr(module, "__all__"):
                     importSymbols = module.__all__
                 else:
-                    importSymbols = module.__dict__.keys()
+                    importSymbols = list(module.__dict__.keys())
 
             for symbolName in importSymbols:
                 if hasattr(module, symbolName):