Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed M_POP_KEY variable

Browse source
This commit is contained in:
iLLiCiTiT 2021-02-09 10:44:25 +01:00
parent ff0c168715
commit a04014d1f4
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pype/settings/lib.py
View file

@ -6,7 +6,6 @@ import copy
from .constants import (
M_OVERRIDEN_KEY,
M_ENVIRONMENT_KEY,
M_POP_KEY,
METADATA_KEYS,
@ -292,10 +291,7 @@ def merge_overrides(source_dict, override_dict):
overriden_keys = set()
for key, value in override_dict.items():
if value == M_POP_KEY:
source_dict.pop(key)
elif (key in overriden_keys or key not in source_dict):
if (key in overriden_keys or key not in source_dict):
source_dict[key] = value
elif isinstance(value, dict) and isinstance(source_dict[key], dict):