alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix yaml parsing

Browse Source
This commit is contained in:
aerinon
2022-05-19 12:20:30 -06:00
parent 041443be3d
commit e40c4290c9
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/classes/CustomSettings.py
View File

@@ -334,12 +334,9 @@ class CustomSettings(object):
def load_yaml(path): def load_yaml(path):
try: if os.path.exists(Path(path)):
return yaml.load(path, Loader=yaml.SafeLoader) with open(path, "r", encoding="utf-8") as f:
except yaml.YAMLError as exc: return yaml.load(f, Loader=yaml.SafeLoader)
if os.path.exists(Path(path)): elif urllib.parse.urlparse(path).scheme in ['http', 'https']:
with open(path, "r", encoding="utf-8") as f: return yaml.load(urllib.request.urlopen(path), Loader=yaml.FullLoader)
return yaml.load(f, Loader=yaml.SafeLoader)
elif urllib.parse.urlparse(path).scheme in ['http', 'https']:
return yaml.load(urllib.request.urlopen(path), Loader=yaml.FullLoader)

13
source/tools/MysteryUtils.py
View File

@@ -9,14 +9,11 @@ import yaml
def get_weights(path): def get_weights(path):
try: if os.path.exists(Path(path)):
return yaml.load(path, Loader=yaml.SafeLoader) with open(path, "r", encoding="utf-8") as f:
except yaml.YAMLError as exc: return yaml.load(f, Loader=yaml.SafeLoader)
if os.path.exists(Path(path)): elif urllib.parse.urlparse(path).scheme in ['http', 'https']:
with open(path, "r", encoding="utf-8") as f: return yaml.load(urllib.request.urlopen(path), Loader=yaml.FullLoader)
return yaml.load(f, Loader=yaml.SafeLoader)
elif urllib.parse.urlparse(path).scheme in ['http', 'https']:
return yaml.load(urllib.request.urlopen(path), Loader=yaml.FullLoader)
def roll_settings(weights): def roll_settings(weights):