From 372569c5b1c3d126f2f2b3aa99ea903607534ffd Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 3 Dec 2020 22:02:14 +0100 Subject: [PATCH] fix imports and usage of get_anatomy_settings --- pype/api.py | 4 ++-- pype/modules/ftrack/lib/avalon_sync.py | 4 ++-- pype/settings/lib.py | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pype/api.py b/pype/api.py index 3854da6d30..8bf6a9b4b3 100644 --- a/pype/api.py +++ b/pype/api.py @@ -2,7 +2,7 @@ from .settings import ( get_system_settings, get_project_settings, get_current_project_settings, - get_anatomy_data, + get_anatomy_settings, get_environments ) from pypeapp import ( @@ -55,7 +55,7 @@ __all__ = [ "get_system_settings", "get_project_settings", "get_current_project_settings", - "get_anatomy_data", + "get_anatomy_settings", "get_environments", "Logger", diff --git a/pype/modules/ftrack/lib/avalon_sync.py b/pype/modules/ftrack/lib/avalon_sync.py index 0716a5975f..cb34ce918d 100644 --- a/pype/modules/ftrack/lib/avalon_sync.py +++ b/pype/modules/ftrack/lib/avalon_sync.py @@ -8,7 +8,7 @@ import copy from avalon.api import AvalonMongoDB import avalon -from pype.api import Logger, Anatomy, get_anatomy_data +from pype.api import Logger, Anatomy, get_anatomy_settings from bson.objectid import ObjectId from bson.errors import InvalidId @@ -1096,7 +1096,7 @@ class SyncEntitiesFactory: def prepare_ftrack_ent_data(self): project_name = self.entities_dict[self.ft_project_id]["name"] - project_anatomy_data = get_anatomy_data(project_name) + project_anatomy_data = get_anatomy_settings(project_name) task_type_mapping = ( project_anatomy_data["attributes"]["task_short_names"] diff --git a/pype/settings/lib.py b/pype/settings/lib.py index 60e5f00dba..c8578b84f8 100644 --- a/pype/settings/lib.py +++ b/pype/settings/lib.py @@ -440,7 +440,7 @@ def get_default_project_settings(clear_metadata=True): return result -def get_default_anatomy_settings(): +def get_default_anatomy_settings(clear_metadata=True): """Project anatomy data with applied studio's default project overrides.""" default_values = get_default_settings()[PROJECT_ANATOMY_KEY] studio_values = get_studio_project_anatomy_overrides() @@ -450,8 +450,7 @@ def get_default_anatomy_settings(): return result - -def get_anatomy_settings(project_name): +def get_anatomy_settings(project_name, clear_metadata=True): """Project anatomy data with applied studio and project overrides.""" if not project_name: raise ValueError(