From 4903c09f40a870c802f84f0c070d70c1e8d7052f Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 1 Oct 2020 17:59:20 +0200 Subject: [PATCH] variable POP_KEY renamed to M_POP_KEY --- pype/settings/lib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pype/settings/lib.py b/pype/settings/lib.py index f8b483cae9..4faf757198 100644 --- a/pype/settings/lib.py +++ b/pype/settings/lib.py @@ -8,7 +8,7 @@ log = logging.getLogger(__name__) # Metadata keys for work with studio and project overrides M_OVERRIDEN_KEY = "__overriden_keys__" # NOTE key popping not implemented yet -POP_KEY = "__pop_key__" +M_POP_KEY = "__pop_key__" # Folder where studio overrides are stored STUDIO_OVERRIDES_PATH = os.environ["PYPE_PROJECT_CONFIGS"] @@ -229,7 +229,7 @@ def merge_overrides(global_dict, override_dict): overriden_keys = set() for key, value in override_dict.items(): - if value == POP_KEY: + if value == M_POP_KEY: global_dict.pop(key) elif (