From 568a07626677ae3dacb088c69969eca40048656c Mon Sep 17 00:00:00 2001 From: John Cote Date: Sun, 5 Jul 2015 21:53:42 -0400 Subject: [PATCH] Deprecate has_key and fix bugs --- toontown/building/DistributedBuildingAI.py | 2 +- toontown/catalog/AccountDateAI.py | 2 +- toontown/catalog/CatalogFurnitureItem.py | 2 +- toontown/catalog/CatalogGardenItem.py | 4 ++-- toontown/catalog/CatalogGenerator.py | 2 +- toontown/cogdominium/CogdoCraneGame.py | 2 +- toontown/cogdominium/CogdoFlyingCameraManager.py | 4 ++-- toontown/cogdominium/CogdoFlyingLevel.py | 2 +- toontown/cogdominium/CogdoMazeGame.py | 2 +- toontown/cogdominium/CogdoMazeSuits.py | 2 +- toontown/cogdominium/DistCogdoGame.py | 2 +- toontown/cogdominium/DistributedCogdoInterior.py | 8 ++++---- toontown/cogdominium/DistributedCogdoInteriorAI.py | 2 +- toontown/coghq/DistributedBanquetTable.py | 6 +++--- toontown/estate/DistributedCannon.py | 2 +- toontown/pets/PetDNA.py | 2 +- toontown/shtiker/PhotoAlbumPage.py | 2 +- toontown/suit/SuitPlannerBase.py | 2 +- toontown/toon/DistributedNPCPetclerkAI.py | 2 +- toontown/toon/LocalToon.py | 8 ++++---- 20 files changed, 30 insertions(+), 30 deletions(-) diff --git a/toontown/building/DistributedBuildingAI.py b/toontown/building/DistributedBuildingAI.py index 7e065afc..03c64232 100755 --- a/toontown/building/DistributedBuildingAI.py +++ b/toontown/building/DistributedBuildingAI.py @@ -334,7 +334,7 @@ class DistributedBuildingAI(DistributedObjectAI.DistributedObjectAI): victorList.extend([None, None, None, None]) for i in xrange(0, 4): victor = victorList[i] - if victor == None or not self.air.doId2do.has_key(victor): + if victor == None or not victor in self.air.doId2do: victorList[i] = 0 continue event = self.air.getAvatarExitEvent(victor) diff --git a/toontown/catalog/AccountDateAI.py b/toontown/catalog/AccountDateAI.py index dd96e7f5..57794b1b 100755 --- a/toontown/catalog/AccountDateAI.py +++ b/toontown/catalog/AccountDateAI.py @@ -15,7 +15,7 @@ class AccountDateAI(DistributedObjectAI): return def callback(dclass, fields): - if dclass is not None and dclass == self.air.dclassesByName['AccountAI'] and fields.has_key('CREATED'): + if dclass is not None and dclass == self.air.dclassesByName['AccountAI'] and 'CREATED' in fields: self.sendUpdateToAvatarId(avId, 'requestDateResult', [fields.get('CREATED')]) else: self.sendUpdateToAvatarId(avId, 'requestDateResult', [None]) diff --git a/toontown/catalog/CatalogFurnitureItem.py b/toontown/catalog/CatalogFurnitureItem.py index 18bc467f..ad630c23 100755 --- a/toontown/catalog/CatalogFurnitureItem.py +++ b/toontown/catalog/CatalogFurnitureItem.py @@ -63,7 +63,7 @@ ClosetToClothes = { } ClothesToCloset = {} for closetId, maxClothes in ClosetToClothes.items(): - if not ClothesToCloset.has_key(maxClothes): + if not maxClothes in ClothesToCloset: ClothesToCloset[maxClothes] = (closetId,) else: ClothesToCloset[maxClothes] += (closetId,) diff --git a/toontown/catalog/CatalogGardenItem.py b/toontown/catalog/CatalogGardenItem.py index 57b2f675..1d340357 100755 --- a/toontown/catalog/CatalogGardenItem.py +++ b/toontown/catalog/CatalogGardenItem.py @@ -50,7 +50,7 @@ class CatalogGardenItem(CatalogItem.CatalogItem): def getPicture(self, avatar): photoModel = GardenGlobals.Specials[self.gardenIndex]['photoModel'] - if GardenGlobals.Specials[self.gardenIndex].has_key('photoAnimation'): + if 'photoAnimation' in GardenGlobals.Specials[self.gardenIndex]: modelPath = photoModel + GardenGlobals.Specials[self.gardenIndex]['photoAnimation'][0] animationName = GardenGlobals.Specials[self.gardenIndex]['photoAnimation'][1] animationPath = photoModel + animationName @@ -161,7 +161,7 @@ class CatalogGardenItem(CatalogItem.CatalogItem): result = False if canPlant < numBeansRequired: result = True - if not result and GardenGlobals.Specials.has_key(self.gardenIndex) and GardenGlobals.Specials[self.gardenIndex].has_key('minSkill'): + if not result and self.gardenIndex in GardenGlobals.Specials and 'minSkill' in GardenGlobals.Specials[self.gardenIndex]: minSkill = GardenGlobals.Specials[self.gardenIndex]['minSkill'] if avatar.shovelSkill < minSkill: result = True diff --git a/toontown/catalog/CatalogGenerator.py b/toontown/catalog/CatalogGenerator.py index d6a2f9d3..641b5811 100755 --- a/toontown/catalog/CatalogGenerator.py +++ b/toontown/catalog/CatalogGenerator.py @@ -1738,7 +1738,7 @@ class CatalogGenerator: return def __recordScheduleItem(self, sched, weekCode, maybeWeekCode, item): - if not sched.has_key(item): + if not item in sched: sched[item] = [[], []] if weekCode != None: sched[item][0].append(weekCode) diff --git a/toontown/cogdominium/CogdoCraneGame.py b/toontown/cogdominium/CogdoCraneGame.py index 6c2a8ed7..70e06f19 100755 --- a/toontown/cogdominium/CogdoCraneGame.py +++ b/toontown/cogdominium/CogdoCraneGame.py @@ -67,7 +67,7 @@ class CogdoCraneGame(DirectObject): self.players.remove(cPlayer) break - if self.toonId2Player.has_key(player.toon.doId): + if player.toon.doId in self.toonId2Player: del self.toonId2Player[player.toon.doId] def handleToonLeft(self, toonId): diff --git a/toontown/cogdominium/CogdoFlyingCameraManager.py b/toontown/cogdominium/CogdoFlyingCameraManager.py index d0142399..9ce0e81e 100755 --- a/toontown/cogdominium/CogdoFlyingCameraManager.py +++ b/toontown/cogdominium/CogdoFlyingCameraManager.py @@ -161,11 +161,11 @@ class CogdoFlyingCameraManager: name = entry.getIntoNode().getName() if name.find('col_') >= 0: np = entry.getIntoNodePath().getParent() - if not nodesInBetween.has_key(np): + if not np in nodesInBetween: nodesInBetween[np] = np.getParent() for np in nodesInBetween.keys(): - if self._betweenCamAndToon.has_key(np): + if np in self._betweenCamAndToon: del self._betweenCamAndToon[np] else: np.setTransparency(True) diff --git a/toontown/cogdominium/CogdoFlyingLevel.py b/toontown/cogdominium/CogdoFlyingLevel.py index c9a1b214..288ff719 100755 --- a/toontown/cogdominium/CogdoFlyingLevel.py +++ b/toontown/cogdominium/CogdoFlyingLevel.py @@ -168,7 +168,7 @@ class CogdoFlyingLevel(DirectObject): self.endPlatform.onstage() self._currentQuadNum = quadNum - for i in xrange(0, max(self._currentQuadNum - self.quadVisibiltyBehind, 0)) + range(min(self._currentQuadNum + self.quadVisibiltyAhead + 1, self._numQuads), self._numQuads): + for i in range(0, max(self._currentQuadNum - self.quadVisibiltyBehind, 0)) + range(min(self._currentQuadNum + self.quadVisibiltyAhead + 1, self._numQuads), self._numQuads): self.quadrants[i].offstage() if i == 0: self.startPlatform.offstage() diff --git a/toontown/cogdominium/CogdoMazeGame.py b/toontown/cogdominium/CogdoMazeGame.py index 8bd71e47..d0b5af19 100755 --- a/toontown/cogdominium/CogdoMazeGame.py +++ b/toontown/cogdominium/CogdoMazeGame.py @@ -271,7 +271,7 @@ class CogdoMazeGame(DirectObject): self.players.remove(cPlayer) break - if self.toonId2Player.has_key(player.toon.doId): + if player.toon.doId in self.toonId2Player: del self.toonId2Player[player.toon.doId] self.guiMgr.mazeMapGui.removeToon(player.toon) diff --git a/toontown/cogdominium/CogdoMazeSuits.py b/toontown/cogdominium/CogdoMazeSuits.py index 9b5edbfc..69d6715c 100755 --- a/toontown/cogdominium/CogdoMazeSuits.py +++ b/toontown/cogdominium/CogdoMazeSuits.py @@ -19,7 +19,7 @@ class CogdoMazeSuit(MazeSuit, FSM, CogdoMazeSplattable): MazeSuit.__init__(self, serialNum, maze, randomNumGen, data['cellWalkPeriod'], difficulty, data['dnaName'], startTile=startTile, walkSameDirectionProb=Globals.SuitWalkSameDirectionProb, walkTurnAroundProb=Globals.SuitWalkTurnAroundProb, uniqueRandomNumGen=False, walkAnimName=walkAnimName) FSM.__init__(self, 'CogdoMazeSuit') CogdoMazeSplattable.__init__(self, self.suit, '%s-%i' % (Globals.SuitCollisionName, self.serialNum), 1.5) - if data.has_key('scale'): + if 'scale' in data: self.suit.setScale(data['scale']) self.hp = data['hp'] self.type = cogdoSuitType diff --git a/toontown/cogdominium/DistCogdoGame.py b/toontown/cogdominium/DistCogdoGame.py index 150c4e3f..5f1fa24a 100755 --- a/toontown/cogdominium/DistCogdoGame.py +++ b/toontown/cogdominium/DistCogdoGame.py @@ -72,7 +72,7 @@ class DistCogdoGame(DistCogdoGameBase, DistributedObject): return def getToon(self, toonId): - if self.cr.doId2do.has_key(toonId): + if toonId in self.cr.doId2do: return self.cr.doId2do[toonId] else: return None diff --git a/toontown/cogdominium/DistributedCogdoInterior.py b/toontown/cogdominium/DistributedCogdoInterior.py index fcaa93c7..837c3e3e 100755 --- a/toontown/cogdominium/DistributedCogdoInterior.py +++ b/toontown/cogdominium/DistributedCogdoInterior.py @@ -266,7 +266,7 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.ignore(toon.uniqueName('disable')) def __finishInterval(self, name): - if self.activeIntervals.has_key(name): + if name in self.activeIntervals: interval = self.activeIntervals[name] if interval.isPlaying(): interval.finish() @@ -315,7 +315,7 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.toons = [] for toonId in toonIds: if toonId != 0: - if self.cr.doId2do.has_key(toonId): + if toonId in self.cr.doId2do: toon = self.cr.doId2do[toonId] toon.stopSmooth() self.toons.append(toon) @@ -333,7 +333,7 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.suits = [] self.joiningReserves = [] for suitId in suitIds: - if self.cr.doId2do.has_key(suitId): + if suitId in self.cr.doId2do: suit = self.cr.doId2do[suitId] self.suits.append(suit) suit.fsm.request('Battle') @@ -353,7 +353,7 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): self.reserveSuits = [] for index in xrange(len(reserveIds)): suitId = reserveIds[index] - if self.cr.doId2do.has_key(suitId): + if suitId in self.cr.doId2do: suit = self.cr.doId2do[suitId] self.reserveSuits.append((suit, values[index])) else: diff --git a/toontown/cogdominium/DistributedCogdoInteriorAI.py b/toontown/cogdominium/DistributedCogdoInteriorAI.py index daedeeb1..daa24ee2 100755 --- a/toontown/cogdominium/DistributedCogdoInteriorAI.py +++ b/toontown/cogdominium/DistributedCogdoInteriorAI.py @@ -198,7 +198,7 @@ class DistributedCogdoInteriorAI(DistributedObjectAI, FSM.FSM): if not avId in self.toons: self.toons.append(avId) - if self.air.doId2do.has_key(avId): + if avId in self.air.doId2do: event = self.air.getAvatarExitEvent(avId) self.accept(event, self.__handleUnexpectedExit, [avId]) diff --git a/toontown/coghq/DistributedBanquetTable.py b/toontown/coghq/DistributedBanquetTable.py index 5bf867d6..2d3ca4eb 100755 --- a/toontown/coghq/DistributedBanquetTable.py +++ b/toontown/coghq/DistributedBanquetTable.py @@ -403,19 +403,19 @@ class DistributedBanquetTable(DistributedObject.DistributedObject, FSM.FSM, Banq self.activeIntervals = {} def clearInterval(self, name, finish = 1): - if self.activeIntervals.has_key(name): + if name in self.activeIntervals: ival = self.activeIntervals[name] if finish: ival.finish() else: ival.pause() - if self.activeIntervals.has_key(name): + if name in self.activeIntervals: del self.activeIntervals[name] else: self.notify.debug('interval: %s already cleared' % name) def finishInterval(self, name): - if self.activeIntervals.has_key(name): + if name in self.activeIntervals: interval = self.activeIntervals[name] interval.finish() diff --git a/toontown/estate/DistributedCannon.py b/toontown/estate/DistributedCannon.py index 752e1232..3ac57e63 100755 --- a/toontown/estate/DistributedCannon.py +++ b/toontown/estate/DistributedCannon.py @@ -266,7 +266,7 @@ class DistributedCannon(DistributedObject.DistributedObject): self.curPinballScore = 0 self.curPinballMultiplier = 1 self.incrementPinballInfo(0, 0) - if self.cr.doId2do.has_key(self.avId): + if self.avId in self.cr.doId2do: self.av = self.cr.doId2do[self.avId] self.acceptOnce(self.av.uniqueName('disable'), self.__avatarGone) self.av.stopSmooth() diff --git a/toontown/pets/PetDNA.py b/toontown/pets/PetDNA.py index 421e72e7..6b5d61ed 100755 --- a/toontown/pets/PetDNA.py +++ b/toontown/pets/PetDNA.py @@ -241,7 +241,7 @@ def getBodyRarity(bodyIndex): for zoneId in PetRarities['body']: for body in PetRarities['body'][zoneId]: totalWeight += PetRarities['body'][zoneId][body] - if weight.has_key(body): + if body in weight: weight[body] += PetRarities['body'][zoneId][body] else: weight[body] = PetRarities['body'][zoneId][body] diff --git a/toontown/shtiker/PhotoAlbumPage.py b/toontown/shtiker/PhotoAlbumPage.py index e1b2e608..c3a008dd 100755 --- a/toontown/shtiker/PhotoAlbumPage.py +++ b/toontown/shtiker/PhotoAlbumPage.py @@ -258,7 +258,7 @@ class PhotoAlbumPage(ShtikerPage.ShtikerPage): del self.photos[photo] for photo in newPhotos: - if not self.photos.has_key(photo): + if not photo in self.photos: photoButton = self.makePhotoButton(photo) self.scrollList.addItem(photoButton) self.photos[photo] = photoButton diff --git a/toontown/suit/SuitPlannerBase.py b/toontown/suit/SuitPlannerBase.py index caa8f504..32386238 100755 --- a/toontown/suit/SuitPlannerBase.py +++ b/toontown/suit/SuitPlannerBase.py @@ -563,7 +563,7 @@ class SuitPlannerBase: self.notify.warning('interactive prop %s at %s not associated with a a battle' % (childDnaGroup, zoneId)) elif battleCellId == 0: - if self.cellToGagBonusDict.has_key(zoneId): + if zoneId in self.cellToGagBonusDict: self.notify.error('FIXME battle cell at zone %s has two props %s %s linked to it' % (zoneId, self.cellToGagBonusDict[zoneId], childDnaGroup)) else: name = childDnaGroup.getName() diff --git a/toontown/toon/DistributedNPCPetclerkAI.py b/toontown/toon/DistributedNPCPetclerkAI.py index 85766b82..5eebcedf 100755 --- a/toontown/toon/DistributedNPCPetclerkAI.py +++ b/toontown/toon/DistributedNPCPetclerkAI.py @@ -21,7 +21,7 @@ class DistributedNPCPetclerkAI(DistributedNPCToonBaseAI): def avatarEnter(self): avId = self.air.getAvatarIdFromSender() - if not self.air.doId2do.has_key(avId): + if not avId in self.air.doId2do: self.notify.warning('Avatar: %s not found' % avId) return if self.isBusy(): diff --git a/toontown/toon/LocalToon.py b/toontown/toon/LocalToon.py index a0011696..c8e09d90 100755 --- a/toontown/toon/LocalToon.py +++ b/toontown/toon/LocalToon.py @@ -635,11 +635,11 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar): tossTrack = self.tossTrack self.tossTrack = None tossTrack.finish() - if self.pieTracks.has_key(sequence): + if sequence in self.pieTracks: pieTrack = self.pieTracks[sequence] del self.pieTracks[sequence] pieTrack.finish() - if self.splatTracks.has_key(sequence): + if sequence in self.splatTracks: splatTrack = self.splatTracks[sequence] del self.splatTracks[sequence] splatTrack.finish() @@ -679,7 +679,7 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar): self.__piePowerMeter.hide() def __finishPieTrack(self, sequence): - if self.pieTracks.has_key(sequence): + if sequence in self.pieTracks: pieTrack = self.pieTracks[sequence] del self.pieTracks[sequence] pieTrack.finish() @@ -691,7 +691,7 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar): return sequence = int(entry.getFromNodePath().getNetTag('pieSequence')) self.__finishPieTrack(sequence) - if self.splatTracks.has_key(sequence): + if sequence in self.splatTracks: splatTrack = self.splatTracks[sequence] del self.splatTracks[sequence] splatTrack.finish()