From a04014d1f4a74fc3a2c30c95529329d354521468 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 9 Feb 2021 10:44:25 +0100 Subject: [PATCH] removed M_POP_KEY variable --- pype/settings/constants.py | 6 +----- pype/settings/lib.py | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pype/settings/constants.py b/pype/settings/constants.py index d21817fb8e..c68826f45b 100644 --- a/pype/settings/constants.py +++ b/pype/settings/constants.py @@ -4,14 +4,11 @@ M_OVERRIDEN_KEY = "__overriden_keys__" M_ENVIRONMENT_KEY = "__environment_keys__" # Metadata key for storing dynamic created labels M_DYNAMIC_KEY_LABEL = "__dynamic_keys_labels__" -# NOTE key popping not implemented yet -M_POP_KEY = "__pop_key__" METADATA_KEYS = ( M_OVERRIDEN_KEY, M_ENVIRONMENT_KEY, - M_DYNAMIC_KEY_LABEL, - M_POP_KEY + M_DYNAMIC_KEY_LABEL ) # File where studio's system overrides are stored @@ -24,7 +21,6 @@ __all__ = ( "M_OVERRIDEN_KEY", "M_ENVIRONMENT_KEY", "M_DYNAMIC_KEY_LABEL", - "M_POP_KEY", "METADATA_KEYS", diff --git a/pype/settings/lib.py b/pype/settings/lib.py index fcbe2604d3..b011242479 100644 --- a/pype/settings/lib.py +++ b/pype/settings/lib.py @@ -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):