diff --git a/python/CFBank.py b/python/CFBank.py index 8d8219315..ce024a5ff 100644 --- a/python/CFBank.py +++ b/python/CFBank.py @@ -33,7 +33,7 @@ class CFBank: self.bankdb = shelve.open(self.bankdb_file, writeback=True) def deposit(self, user, amount): - if not self.bankdb.has_key(user): + if not user in self.bankdb: self.bankdb[user]=amount else: temp=self.bankdb[user] @@ -41,7 +41,7 @@ class CFBank: self.bankdb.sync() def withdraw(self, user, amount): - if self.bankdb.has_key(user): + if user in self.bankdb: if (self.bankdb[user] >= amount): temp=self.bankdb[user] self.bankdb[user]=temp-amount @@ -50,13 +50,13 @@ class CFBank: return 0 def getbalance(self,user): - if self.bankdb.has_key(user): - return self.bankdb[user] - else: - return 0 + if user in self.bankdb: + return self.bankdb[user] + else: + return 0 def remove_account(self,user): - if self.bankdb.has_key(user): + if user in self.bankdb: del self.bankdb[user] Crossfire.Log(Crossfire.LogDebug, "%s's bank account removed." %user) self.bankdb.sync() diff --git a/python/CFBoard.py b/python/CFBoard.py index 757357ca9..52e7da41d 100644 --- a/python/CFBoard.py +++ b/python/CFBoard.py @@ -35,7 +35,7 @@ class CFBoard: self.boarddb = shelve.open(self.boarddb_file) def write(self, boardname, author, message): - if not self.boarddb.has_key(boardname): + if not boardname in self.boarddb: self.boarddb[boardname]=[[author,message]] else: temp=self.boarddb[boardname] @@ -43,13 +43,13 @@ class CFBoard: self.boarddb[boardname]=temp def list(self, boardname): - if self.boarddb.has_key(boardname): + if boardname in self.boarddb: elements=self.boarddb[boardname] return elements def delete(self, boardname, id): - if self.boarddb.has_key(boardname): + if boardname in self.boarddb: if id>0 and id<=len(self.boarddb[boardname]): temp=self.boarddb[boardname] temp.pop(id-1) @@ -57,14 +57,14 @@ class CFBoard: return 1 return 0 - def countmsg(self, boardname): - if self.boarddb.has_key(boardname): - return len(self.boarddb[boardname]) - else: - return 0 + def countmsg(self, boardname): + if boardname in self.boarddb: + return len(self.boarddb[boardname]) + else: + return 0 def getauthor(self, boardname, id): - if self.boarddb.has_key(boardname): + if boardname in self.boarddb: if id>0 and id<=len(self.boarddb[boardname]): author,message=self.boarddb[boardname][id-1] return author diff --git a/python/CFDataFile.py b/python/CFDataFile.py index 8cf34a69d..d4b0c5f8b 100644 --- a/python/CFDataFile.py +++ b/python/CFDataFile.py @@ -113,7 +113,7 @@ class CFData: self.datadb = self.datafile.getData() def remove_record(self, name): - if self.datadb.has_key(name): + if name in self.datadb: del self.datadb[name] self.datafile.putData(self.datadb) return 1 @@ -122,7 +122,7 @@ class CFData: def exist(self, name): '''checks if a record exists given the primary key as "name"''' - if self.datadb.has_key(name): + if name in self.datadb: return 1 else: return 0 diff --git a/python/CFGamble.py b/python/CFGamble.py index 783f280be..55c236416 100644 --- a/python/CFGamble.py +++ b/python/CFGamble.py @@ -24,7 +24,7 @@ class SlotMachine: self.maxpot = maxpot def placebet(self,amount): - if not self.slotdb.has_key(self.slotname): + if self.slotname in not self.slotdb: self.slotdb[self.slotname] = self.minpot+amount else: temp=self.slotdb[self.slotname] diff --git a/python/CFMail.py b/python/CFMail.py index fba6089e1..0fa509de1 100644 --- a/python/CFMail.py +++ b/python/CFMail.py @@ -36,7 +36,7 @@ class CFMail: def send(self, type, toname, fromname, message): # type: 1=mailscoll, 2=newsletter, 3=mailwarning - if not self.maildb.has_key(toname): + if not toname in self.maildb: self.maildb[toname]=[[type,fromname,message]] else: temp=self.maildb[toname] @@ -44,14 +44,14 @@ class CFMail: self.maildb[toname]=temp def receive(self, toname): - if self.maildb.has_key(toname): + if toname in self.maildb: elements=self.maildb[toname] del self.maildb[toname] return elements def countmail(self, toname): - if self.maildb.has_key(toname): + if toname in self.maildb: return len(self.maildb[toname]) else: return 0 diff --git a/python/IPO/say.py b/python/IPO/say.py index ac5326394..b469b6908 100755 --- a/python/IPO/say.py +++ b/python/IPO/say.py @@ -135,7 +135,7 @@ elif text[0] == 'mailwarning': whoami.Say('You need to be DM to be able to use this command') -elif packages.has_key(text[0]): +elif text[0] in packages: if len(text) == 2: if log.info(text[1]): price = packages[text[0]][0] diff --git a/python/events/python_event.py b/python/events/python_event.py index 38c2517a5..1ab0d4c2b 100644 --- a/python/events/python_event.py +++ b/python/events/python_event.py @@ -15,4 +15,4 @@ if os.path.exists(path): for script in scripts: if (script.endswith('.py')): - execfile(os.path.join(path, script)) + exec(open(os.path.join(path, script)).read()) diff --git a/python/events/python_init.py b/python/events/python_init.py index d7f505449..08c6aea3d 100644 --- a/python/events/python_init.py +++ b/python/events/python_init.py @@ -12,4 +12,4 @@ if os.path.exists(path): for script in scripts: if (script.endswith('.py')): - execfile(os.path.join(path, script)) + exec(open(os.path.join(path, script)).read()) diff --git a/python/maps/navar-midane_time.py b/python/maps/navar-midane_time.py index 53e160ba9..aa96e66f6 100644 --- a/python/maps/navar-midane_time.py +++ b/python/maps/navar-midane_time.py @@ -10,7 +10,7 @@ who = Crossfire.WhoAmI() data = CFDataFile.CFData('midane', ['state']) -if not Crossfire.GetPrivateDictionary().has_key('on_map'): +if not 'on_map' in Crossfire.GetPrivateDictionary(): on_map = [] Crossfire.GetPrivateDictionary()['on_map'] = on_map else: diff --git a/python/misc/npc_dialog.py b/python/misc/npc_dialog.py index a9fa51f67..3e3015851 100644 --- a/python/misc/npc_dialog.py +++ b/python/misc/npc_dialog.py @@ -132,7 +132,7 @@ speech = Dialog(player, npc, location) index = 0; for jsonRule in parameters["rules"]: - if (jsonRule.has_key("connected")): + if ("connected" in jsonRule): rule = DialogRule(jsonRule["match"], jsonRule["pre"], jsonRule["msg"], diff --git a/python/monsters/combat_chicken.py b/python/monsters/combat_chicken.py index fdb3b15b4..d287330fe 100644 --- a/python/monsters/combat_chicken.py +++ b/python/monsters/combat_chicken.py @@ -30,7 +30,7 @@ def find_food(chicken, x, y): obj = chicken.Map.ObjectAt(x, y) while obj != None: #Crossfire.Log(Crossfire.LogMonster, obj.Name) - if eat.has_key(obj.NamePl): + if obj.NamePl in eat: return obj obj = obj.Above return None diff --git a/python/monsters/farnass.py b/python/monsters/farnass.py index 7b0cdaea2..1c49475f7 100644 --- a/python/monsters/farnass.py +++ b/python/monsters/farnass.py @@ -108,7 +108,7 @@ def close_boiler(): def clean_check(): '''Cancel next check.''' d = Crossfire.GetPrivateDictionary() - if d.has_key(key_need_check): + if key_need_check in d: del d[key_need_check] def move_cook(): @@ -165,7 +165,7 @@ def move_cook(): return d = Crossfire.GetPrivateDictionary() - if d.has_key(key_need_check): + if key_need_check in d: whoami.Map.Print('You see %s look at the frypan.'%whoami.Name, color) del d[key_need_check] check_ingredients() diff --git a/python/tod/filter.py b/python/tod/filter.py index 34c131b47..26411def3 100644 --- a/python/tod/filter.py +++ b/python/tod/filter.py @@ -39,9 +39,9 @@ import string from CFTimeOfDay import TimeOfDay import cjson parameters = cjson.decode(Crossfire.WhatIsEvent().Message) -inverse = parameters.has_key("inverse") and parameters["inverse"] == True +inverse = "inverse" in parameters and parameters["inverse"] == True Crossfire.SetReturnValue(not inverse) -if not parameters.has_key("match"): +if not "match" in parameters: Crossfire.Log(Crossfire.LogError,"Script filter.py didn't get a 'match' parameter. Only got %s" %parameters) elif string.lower(parameters["match"]) == "one": if TimeOfDay().matchAny(parameters["when"]): diff --git a/python/tod/push.py b/python/tod/push.py index 202074cb2..7950eb932 100644 --- a/python/tod/push.py +++ b/python/tod/push.py @@ -57,9 +57,9 @@ event = Crossfire.WhatIsEvent() parameters = cjson.decode(event.Message) alreadymatched = (event.Value!=0) connected = int(parameters["connected"]) -inverse = parameters.has_key("inverse") and parameters["inverse"] == True +inverse = "inverse" in parameters and parameters["inverse"] == True match = False -if not parameters.has_key("match"): +if not "match" in parameters: Crossfire.Log(Crossfire.LogError,"Script push_period.py didn't get a 'match' parameter. Only got %s" %parameters) elif string.lower(parameters["match"]) == "one": match=TimeOfDay().matchAny(parameters["when"]) != inverse diff --git a/python/tod/replace.py b/python/tod/replace.py index 40cb5fefc..849a993b0 100644 --- a/python/tod/replace.py +++ b/python/tod/replace.py @@ -47,9 +47,9 @@ import cjson event = Crossfire.WhatIsEvent() parameters = cjson.decode(event.Message) alreadymatched = (event.Value!=0) -inverse = parameters.has_key("inverse") and parameters["inverse"] == True +inverse = "inverse" in parameters and parameters["inverse"] == True match = False -if not parameters.has_key("match"): +if not "match" in parameters: Crossfire.Log(Crossfire.LogError,"Script replace_period.py didn't get a 'match' parameter. Only got %s" %parameters) elif string.lower(parameters["match"]) == "one": match=TimeOfDay().matchAny(parameters["when"]) != inverse diff --git a/python/tod/replace_in_map.py b/python/tod/replace_in_map.py index 23a4e950a..9b17bda24 100644 --- a/python/tod/replace_in_map.py +++ b/python/tod/replace_in_map.py @@ -11,9 +11,9 @@ alreadymatched = (event.Value!=0) parameters = cjson.decode(event.Message) current = TimeOfDay() #current.log() -inverse = parameters.has_key("inverse") and parameters["inverse"] == True +inverse = "inverse" in parameters and parameters["inverse"] == True match = False -if not parameters.has_key("match"): +if not "match" in parameters: Crossfire.Log(Crossfire.LogError,"Script replace_in_map_period.py didn't get a 'match' parameter. Only got %s" %parameters) elif string.lower(parameters["match"]) == "one": match=TimeOfDay().matchAny(parameters["when"]) != inverse diff --git a/python/tod/sleep.py b/python/tod/sleep.py index 455d4247b..22d8411b9 100644 --- a/python/tod/sleep.py +++ b/python/tod/sleep.py @@ -49,9 +49,9 @@ import cjson event = Crossfire.WhatIsEvent() parameters = cjson.decode(event.Message) alreadymatched = (event.Value!=0) -inverse = parameters.has_key("inverse") and parameters["inverse"] == True +inverse = "inverse" in parameters and parameters["inverse"] == True match = False -if not parameters.has_key("match"): +if not "match" in parameters: Crossfire.Log(Crossfire.LogError,"Script sleep.py didn't get a 'match' parameter. Only got %s" %parameters) elif string.lower(parameters["match"]) == "one": match=TimeOfDay().matchAny(parameters["when"]) != inverse