Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed load_json to load_json_file in code

Browse source
This commit is contained in:
iLLiCiTiT 2020-10-03 01:16:41 +02:00
parent 9683208f0c
commit 11766b71a5
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pype/settings/lib.py
View file

@ -153,25 +153,25 @@ def load_jsons_from_dir(path, *args, **kwargs):
def studio_system_settings():
if os.path.exists(SYSTEM_SETTINGS_PATH):
return load_json(SYSTEM_SETTINGS_PATH)
return load_json_file(SYSTEM_SETTINGS_PATH)
return {}
def studio_environments():
if os.path.exists(ENVIRONMENTS_PATH):
return load_json(ENVIRONMENTS_PATH)
return load_json_file(ENVIRONMENTS_PATH)
return {}
def studio_project_settings():
if os.path.exists(PROJECT_SETTINGS_PATH):
return load_json(PROJECT_SETTINGS_PATH)
return load_json_file(PROJECT_SETTINGS_PATH)
return {}
def studio_project_anatomy():
if os.path.exists(PROJECT_ANATOMY_PATH):
return load_json(PROJECT_ANATOMY_PATH)
return load_json_file(PROJECT_ANATOMY_PATH)
return {}
@ -198,7 +198,7 @@ def project_settings_overrides(project_name):
path_to_json = path_to_project_overrides(project_name)
if not os.path.exists(path_to_json):
return {}
return load_json(path_to_json)
return load_json_file(path_to_json)
def project_anatomy_overrides(project_name):
@ -208,7 +208,7 @@ def project_anatomy_overrides(project_name):
path_to_json = path_to_project_anatomy(project_name)
if not os.path.exists(path_to_json):
return {}
return load_json(path_to_json)
return load_json_file(path_to_json)
def merge_overrides(global_dict, override_dict):