Switch to safeloader

Seems like we do not use any custom data structures in yaml
This commit is contained in:
DarkPhoenix
2019-03-26 08:10:40 +03:00
parent facb0b1023
commit 1a5fc31e25
5 changed files with 7 additions and 7 deletions

View File

@@ -113,7 +113,7 @@ def defPaths(customSavePath=None):
# Version data
with open(os.path.join(pyfaPath, "version.yml"), 'r') as file:
data = yaml.load(file, Loader=yaml.FullLoader)
data = yaml.load(file, Loader=yaml.SafeLoader)
version = data['version']
# Where we store the saved fits etc, default is the current users home directory

View File

@@ -8,7 +8,7 @@ import yaml
with open("version.yml", 'r') as file:
data = yaml.load(file, Loader=yaml.FullLoader)
data = yaml.load(file, Loader=yaml.SafeLoader)
version = data['version']
os.environ["PYFA_DIST_DIR"] = os.path.join(os.getcwd(), 'dist')

View File

@@ -10,7 +10,7 @@ import os
with open("version.yml", 'r+') as file:
data = yaml.load(file, Loader=yaml.FullLoader)
data = yaml.load(file, Loader=yaml.SafeLoader)
file.seek(0)
file.truncate()
# todo: run Version() on the tag to ensure that it's of proper formatting - fail a test if not and prevent building

View File

@@ -10,7 +10,7 @@ import json
iconDict = {}
stream = open('iconIDs.yaml', 'r')
docs = yaml.load_all(stream, Loader=yaml.FullLoader)
docs = yaml.load_all(stream, Loader=yaml.SafeLoader)
for doc in docs:
for k,v in list(doc.items()):

View File

@@ -43,9 +43,9 @@ class JargonLoader(object):
self.jargon_mtime != self._get_jargon_file_mtime())
def _load_jargon(self):
jargondata = yaml.load(DEFAULT_DATA, Loader=yaml.FullLoader)
jargondata = yaml.load(DEFAULT_DATA, Loader=yaml.SafeLoader)
with open(JARGON_PATH) as f:
userdata = yaml.load(f, Loader=yaml.FullLoader)
userdata = yaml.load(f, Loader=yaml.SafeLoader)
jargondata.update(userdata)
self.jargon_mtime = self._get_jargon_file_mtime()
self._jargon = Jargon(jargondata)
@@ -57,7 +57,7 @@ class JargonLoader(object):
@staticmethod
def init_user_jargon(jargon_path):
values = yaml.load(DEFAULT_DATA, Loader=yaml.FullLoader)
values = yaml.load(DEFAULT_DATA, Loader=yaml.SafeLoader)
# Disabled for issue/1533; do not overwrite existing user config
# if os.path.exists(jargon_path):