Replace deprecated string.split() amd string.lower() in /python/*/*.py
git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@11453 282e977c-c81d-0410-88c4-b93c2d0d6712master
parent
c589e07ec3
commit
d037e074c6
|
|
@ -45,7 +45,7 @@ if whoami.Name=='Jack':
|
||||||
buddylist = ['buddy','buddy','buddy','buddy','pal','friend','friend','friend','friend','dude','chum', 'sweetie']
|
buddylist = ['buddy','buddy','buddy','buddy','pal','friend','friend','friend','friend','dude','chum', 'sweetie']
|
||||||
|
|
||||||
guildname=Crossfire.ScriptParameters() # 6 is say event
|
guildname=Crossfire.ScriptParameters() # 6 is say event
|
||||||
text = string.split(Crossfire.WhatIsMessage())
|
text = Crossfire.WhatIsMessage().split()
|
||||||
|
|
||||||
if (guildname):
|
if (guildname):
|
||||||
guild = CFGuilds.CFGuild(guildname)
|
guild = CFGuilds.CFGuild(guildname)
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ guildname=Crossfire.ScriptParameters() # 6 is say event
|
||||||
if (guildname):
|
if (guildname):
|
||||||
|
|
||||||
guild = CFGuilds.CFGuild(guildname)
|
guild = CFGuilds.CFGuild(guildname)
|
||||||
text = string.split(Crossfire.WhatIsMessage())
|
text = Crossfire.WhatIsMessage().split()
|
||||||
guildrecord = CFGuilds.CFGuildHouses().info(guildname)
|
guildrecord = CFGuilds.CFGuildHouses().info(guildname)
|
||||||
found = 0
|
found = 0
|
||||||
if text[0] == 'enter' or text[0] == 'Enter':
|
if text[0] == 'enter' or text[0] == 'Enter':
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ print "Activated %s" %guildname
|
||||||
if (guildname):
|
if (guildname):
|
||||||
guild = CFGuilds.CFGuild(guildname)
|
guild = CFGuilds.CFGuild(guildname)
|
||||||
guildhouse = CFGuilds.CFGuildHouses()
|
guildhouse = CFGuilds.CFGuildHouses()
|
||||||
text = string.split(Crossfire.WhatIsMessage())
|
text = Crossfire.WhatIsMessage().split()
|
||||||
|
|
||||||
if guild.info(activatorname) == 0 and isDM == 0:
|
if guild.info(activatorname) == 0 and isDM == 0:
|
||||||
message = 'You don\'t belong to this guild!'
|
message = 'You don\'t belong to this guild!'
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ y2=6
|
||||||
if (guildname):
|
if (guildname):
|
||||||
|
|
||||||
guild = CFGuilds.CFGuild(guildname)
|
guild = CFGuilds.CFGuild(guildname)
|
||||||
text = string.split(Crossfire.WhatIsMessage())
|
text = Crossfire.WhatIsMessage().split()
|
||||||
guildrecord = CFGuilds.CFGuildHouses().info(guildname)
|
guildrecord = CFGuilds.CFGuildHouses().info(guildname)
|
||||||
found = 0
|
found = 0
|
||||||
if text[0] == 'dues' or text[0] == 'Dues':
|
if text[0] == 'dues' or text[0] == 'Dues':
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ guildname=Crossfire.ScriptParameters() # 6 is say event
|
||||||
if (guildname):
|
if (guildname):
|
||||||
|
|
||||||
guild = CFGuilds.CFGuild(guildname)
|
guild = CFGuilds.CFGuild(guildname)
|
||||||
text = string.split(Crossfire.WhatIsMessage())
|
text = Crossfire.WhatIsMessage().split()
|
||||||
guildrecord = CFGuilds.CFGuildHouses().info(guildname)
|
guildrecord = CFGuilds.CFGuildHouses().info(guildname)
|
||||||
found = 0
|
found = 0
|
||||||
if text[0] == 'enter' or text[0] == 'Enter':
|
if text[0] == 'enter' or text[0] == 'Enter':
|
||||||
|
|
|
||||||
|
|
@ -43,10 +43,10 @@ inverse = "inverse" in parameters and parameters["inverse"] == True
|
||||||
Crossfire.SetReturnValue(not inverse)
|
Crossfire.SetReturnValue(not inverse)
|
||||||
if not "match" in parameters:
|
if not "match" in parameters:
|
||||||
Crossfire.Log(Crossfire.LogError,"Script filter.py didn't get a 'match' parameter. Only got %s" %parameters)
|
Crossfire.Log(Crossfire.LogError,"Script filter.py didn't get a 'match' parameter. Only got %s" %parameters)
|
||||||
elif string.lower(parameters["match"]) == "one":
|
elif parameters["match"].lower() == "one":
|
||||||
if TimeOfDay().matchAny(parameters["when"]):
|
if TimeOfDay().matchAny(parameters["when"]):
|
||||||
Crossfire.SetReturnValue(inverse)
|
Crossfire.SetReturnValue(inverse)
|
||||||
elif string.lower(parameters["match"]) == "all":
|
elif parameters["match"].lower() == "all":
|
||||||
if TimeOfDay().matchAll(parameters["when"]):
|
if TimeOfDay().matchAll(parameters["when"]):
|
||||||
Crossfire.SetReturnValue(inverse)
|
Crossfire.SetReturnValue(inverse)
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
|
|
@ -61,9 +61,9 @@ inverse = "inverse" in parameters and parameters["inverse"] == True
|
||||||
match = False
|
match = False
|
||||||
if not "match" in parameters:
|
if not "match" in parameters:
|
||||||
Crossfire.Log(Crossfire.LogError,"Script push_period.py didn't get a 'match' parameter. Only got %s" %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":
|
elif parameters["match"].lower() == "one":
|
||||||
match=TimeOfDay().matchAny(parameters["when"]) != inverse
|
match=TimeOfDay().matchAny(parameters["when"]) != inverse
|
||||||
elif string.lower(parameters["match"]) == "all":
|
elif parameters["match"].lower() == "all":
|
||||||
match=TimeOfDay().matchAll(parameters["when"]) != inverse
|
match=TimeOfDay().matchAll(parameters["when"]) != inverse
|
||||||
else:
|
else:
|
||||||
Crossfire.Log(Crossfire.LogError,"Script push_period.py didn't get a 'match' parameter. Only got %s" %parameters)
|
Crossfire.Log(Crossfire.LogError,"Script push_period.py didn't get a 'match' parameter. Only got %s" %parameters)
|
||||||
|
|
|
||||||
|
|
@ -51,9 +51,9 @@ inverse = "inverse" in parameters and parameters["inverse"] == True
|
||||||
match = False
|
match = False
|
||||||
if not "match" in parameters:
|
if not "match" in parameters:
|
||||||
Crossfire.Log(Crossfire.LogError,"Script replace_period.py didn't get a 'match' parameter. Only got %s" %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":
|
elif parameters["match"].lower() == "one":
|
||||||
match=TimeOfDay().matchAny(parameters["when"]) != inverse
|
match=TimeOfDay().matchAny(parameters["when"]) != inverse
|
||||||
elif string.lower(parameters["match"]) == "all":
|
elif parameters["match"].lower() == "all":
|
||||||
match=TimeOfDay().matchAll(parameters["when"]) != inverse
|
match=TimeOfDay().matchAll(parameters["when"]) != inverse
|
||||||
else:
|
else:
|
||||||
Crossfire.Log(Crossfire.LogError,"Script replace_period.py didn't get a 'match' parameter. Only got %s" %parameters)
|
Crossfire.Log(Crossfire.LogError,"Script replace_period.py didn't get a 'match' parameter. Only got %s" %parameters)
|
||||||
|
|
|
||||||
|
|
@ -15,9 +15,9 @@ inverse = "inverse" in parameters and parameters["inverse"] == True
|
||||||
match = False
|
match = False
|
||||||
if not "match" in parameters:
|
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)
|
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":
|
elif parameters["match"].lower() == "one":
|
||||||
match=TimeOfDay().matchAny(parameters["when"]) != inverse
|
match=TimeOfDay().matchAny(parameters["when"]) != inverse
|
||||||
elif string.lower(parameters["match"]) == "all":
|
elif parameters["match"].lower() == "all":
|
||||||
match=TimeOfDay().matchAll(parameters["when"]) != inverse
|
match=TimeOfDay().matchAll(parameters["when"]) != inverse
|
||||||
else:
|
else:
|
||||||
Crossfire.Log(Crossfire.LogError,"Script replace_in_map_period.py didn't get a 'match' parameter. Only got %s" %parameters)
|
Crossfire.Log(Crossfire.LogError,"Script replace_in_map_period.py didn't get a 'match' parameter. Only got %s" %parameters)
|
||||||
|
|
|
||||||
|
|
@ -53,9 +53,9 @@ inverse = "inverse" in parameters and parameters["inverse"] == True
|
||||||
match = False
|
match = False
|
||||||
if not "match" in parameters:
|
if not "match" in parameters:
|
||||||
Crossfire.Log(Crossfire.LogError,"Script sleep.py didn't get a 'match' parameter. Only got %s" %parameters)
|
Crossfire.Log(Crossfire.LogError,"Script sleep.py didn't get a 'match' parameter. Only got %s" %parameters)
|
||||||
elif string.lower(parameters["match"]) == "one":
|
elif parameters["match"].lower() == "one":
|
||||||
match=TimeOfDay().matchAny(parameters["when"]) != inverse
|
match=TimeOfDay().matchAny(parameters["when"]) != inverse
|
||||||
elif string.lower(parameters["match"]) == "all":
|
elif parameters["match"].lower() == "all":
|
||||||
match=TimeOfDay().matchAll(parameters["when"]) != inverse
|
match=TimeOfDay().matchAll(parameters["when"]) != inverse
|
||||||
else:
|
else:
|
||||||
Crossfire.Log(Crossfire.LogError,"Script sleep.py didn't get a 'match' parameter. Only got %s" %parameters)
|
Crossfire.Log(Crossfire.LogError,"Script sleep.py didn't get a 'match' parameter. Only got %s" %parameters)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue