monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mystery: safer strip

This commit is contained in:
Bonta-kun 2020-01-06 20:14:16 +01:00
parent 48305adaa0
commit 99577d9e4c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Mystery.py
View File

@ -8,15 +8,18 @@ from EntranceRandomizer import parse_arguments
from Main import main as ERmain from Main import main as ERmain
def parse_yaml(txt): def parse_yaml(txt):
def strip(s):
s = s.strip()
return '' if not s else s.strip('"') if s[0] == '"' else s.strip("'") if s[0] == "'" else s
ret = {} ret = {}
indents = {len(txt) - len(txt.lstrip(' ')): ret} indents = {len(txt) - len(txt.lstrip(' ')): ret}
for line in txt.splitlines(): for line in txt.splitlines():
if not line: if not line:
continue continue
name, val = line.split(':', 1) name, val = line.split(':', 1)
val = val.strip() val = strip(val)
spaces = len(name) - len(name.lstrip(' ')) spaces = len(name) - len(name.lstrip(' '))
name = name.strip() name = strip(name)
if val: if val:
indents[spaces][name] = val indents[spaces][name] = val
else: else:
@ -114,7 +117,7 @@ def roll_settings(weights):
return root[option] return root[option]
if not root[option]: if not root[option]:
return None return None
return random.choices(list(root[option].keys()), weights=list(map(int,root[option].values())))[0].replace('"','').replace("'",'') return random.choices(list(root[option].keys()), weights=list(map(int,root[option].values())))[0]
ret = argparse.Namespace() ret = argparse.Namespace()