diff --git a/otp/chat/ChatGlobals.py b/otp/chat/ChatGlobals.py index b7248b1..94203ee 100644 --- a/otp/chat/ChatGlobals.py +++ b/otp/chat/ChatGlobals.py @@ -40,7 +40,7 @@ ThoughtPrefix = '.' def isThought(message): if len(message) == 0: return 0 - elif string.find(message, ThoughtPrefix, 0, len(ThoughtPrefix)) >= 0: + elif message.find(ThoughtPrefix, 0, len(ThoughtPrefix)) >= 0: return 1 else: return 0 diff --git a/otp/chat/ChatManager.py b/otp/chat/ChatManager.py index bd57595..4787025 100644 --- a/otp/chat/ChatManager.py +++ b/otp/chat/ChatManager.py @@ -22,7 +22,7 @@ ThoughtPrefix = '.' def isThought(message): if len(message) == 0: return 0 - elif string.find(message, ThoughtPrefix, 0, len(ThoughtPrefix)) >= 0: + elif message.find(ThoughtPrefix, 0, len(ThoughtPrefix)) >= 0: return 1 else: return 0 diff --git a/otp/level/LevelSpec.py b/otp/level/LevelSpec.py index 2339edc..7077c17 100644 --- a/otp/level/LevelSpec.py +++ b/otp/level/LevelSpec.py @@ -306,7 +306,7 @@ class LevelSpec: entType2ids = self.getEntType2ids(entIds) types = sortList(list(entType2ids.keys()), firstTypes) for type in types: - str += t(1) + '# %s\n' % string.upper(type) + str += t(1) + '# %s\n' % type.upper() entIds = entType2ids[type] entIds.sort() for entId in entIds: diff --git a/toontown/pets/DistributedPetProxy.py b/toontown/pets/DistributedPetProxy.py index 97c9e4c..e644c9b 100644 --- a/toontown/pets/DistributedPetProxy.py +++ b/toontown/pets/DistributedPetProxy.py @@ -25,7 +25,7 @@ class DistributedPetProxy(DistributedObject.DistributedObject): self.requiredMoodComponents = {} def getSetterName(self, valueName, prefix = 'set'): - return '%s%s%s' % (prefix, string.upper(valueName[0]), valueName[1:]) + return '%s%s%s' % (prefix, valueName[0].upper(), valueName[1:]) def setOwnerId(self, ownerId): self.ownerId = ownerId diff --git a/toontown/pets/DistributedPetProxyAI.py b/toontown/pets/DistributedPetProxyAI.py index 156eef1..692521f 100644 --- a/toontown/pets/DistributedPetProxyAI.py +++ b/toontown/pets/DistributedPetProxyAI.py @@ -37,7 +37,7 @@ class DistributedPetProxyAI(DistributedObjectAI.DistributedObjectAI): self.__generateDistMoodFuncs() def getSetterName(self, valueName, prefix = 'set'): - return '%s%s%s' % (prefix, string.upper(valueName[0]), valueName[1:]) + return '%s%s%s' % (prefix, valueName[0].upper(), valueName[1:]) def setDNA(self, dna): head, ears, nose, tail, body, color, colorScale, eyes, gender = dna diff --git a/toontown/pets/PetBase.py b/toontown/pets/PetBase.py index e558233..c21f594 100644 --- a/toontown/pets/PetBase.py +++ b/toontown/pets/PetBase.py @@ -5,7 +5,7 @@ import string class PetBase: def getSetterName(self, valueName, prefix = 'set'): - return '%s%s%s' % (prefix, string.upper(valueName[0]), valueName[1:]) + return '%s%s%s' % (prefix, valueName[0].upper(), valueName[1:]) def getAnimMood(self): if self.mood.getDominantMood() in PetMood.PetMood.ExcitedMoods: diff --git a/toontown/pets/PetshopGUI.py b/toontown/pets/PetshopGUI.py index c276c85..eb3fe79 100644 --- a/toontown/pets/PetshopGUI.py +++ b/toontown/pets/PetshopGUI.py @@ -358,7 +358,7 @@ class PetshopGUI(DirectObject): descList.append('\t%s' % trait) descList.append(TTLocalizer.PetshopDescCost % cost) - self.petDesc.append(string.join(descList, '\n')) + self.petDesc.append('\n'.join(descList)) self.petCost.append(cost) def destroy(self): diff --git a/toontown/shtiker/PhotoAlbumPage.py b/toontown/shtiker/PhotoAlbumPage.py index 2e93625..9a6c039 100644 --- a/toontown/shtiker/PhotoAlbumPage.py +++ b/toontown/shtiker/PhotoAlbumPage.py @@ -4,6 +4,7 @@ from direct.gui.DirectGui import * from panda3d.core import * from toontown.toonbase import TTLocalizer import os +import string from toontown.toonbase import ToontownGlobals class PhotoAlbumPage(ShtikerPage.ShtikerPage): @@ -88,7 +89,7 @@ class PhotoAlbumPage(ShtikerPage.ShtikerPage): def renameDialog(self, str): separator = '_' - validChars = string.letters + string.digits + ' -' + validChars = string.ascii_letters + string.digits + ' -' str = [s for s in str if s in validChars] if not str: self.renameCleanup()