diff --git a/pype/__init__.py b/pype/__init__.py index 8481fa2d48..a2840e271b 100644 --- a/pype/__init__.py +++ b/pype/__init__.py @@ -48,9 +48,12 @@ def patched_discover(superclass): elif superclass.__name__.split(".")[-1] == "Creator": plugin_type = "create" - print(">>> trying to find presets for {}:{} ...".format(host, plugin_type)) + print(">>> Finding presets for {}:{} ...".format(host, plugin_type)) try: - settings = get_project_settings(os.environ['AVALON_PROJECT'])[host][plugin_type] + settings = ( + get_project_settings(os.environ['AVALON_PROJECT']) + [host][plugin_type] + ) except KeyError: print("*** no presets found.") else: diff --git a/pype/hooks/global/pre_global_host_data.py b/pype/hooks/global/pre_global_host_data.py index 09fc707e4e..4910d08010 100644 --- a/pype/hooks/global/pre_global_host_data.py +++ b/pype/hooks/global/pre_global_host_data.py @@ -285,8 +285,10 @@ class GlobalHostDataHook(PreLaunchHook): """ - project_settings = get_project_settings(project_name)['global']['tools'] - startup_presets = project_settings['Workfiles']['last_workfile_on_startup'] + project_settings = ( + get_project_settings(project_name)['global']['tools']) + startup_presets = ( + project_settings['Workfiles']['last_workfile_on_startup']) if not startup_presets: return default_output diff --git a/pype/hosts/harmony/__init__.py b/pype/hosts/harmony/__init__.py index bc91b4db2f..b91c0ad4b1 100644 --- a/pype/hosts/harmony/__init__.py +++ b/pype/hosts/harmony/__init__.py @@ -50,10 +50,18 @@ def get_asset_settings(): } try: - skip_resolution_check = \ - get_current_project_settings()["harmony"]["general"]["skip_resolution_check"] - skip_timelines_check = \ - get_current_project_settings()["harmony"]["general"]["skip_timelines_check"] + skip_resolution_check = ( + get_current_project_settings() + ["harmony"] + ["general"] + ["skip_resolution_check"] + ) + skip_timelines_check = ( + get_current_project_settings() + ["harmony"] + ["general"] + ["skip_timelines_check"] + ) except KeyError: skip_resolution_check = [] skip_timelines_check = [] diff --git a/pype/modules/ftrack/actions/action_create_project_structure.py b/pype/modules/ftrack/actions/action_create_project_structure.py index 1f7dfcec0b..0815f82a69 100644 --- a/pype/modules/ftrack/actions/action_create_project_structure.py +++ b/pype/modules/ftrack/actions/action_create_project_structure.py @@ -73,9 +73,9 @@ class CreateProjectFolders(BaseAction): project_entity = self.get_project_from_entity(entities[0]) # Load settings for project project_name = project_entity["full_name"] - get_project_settings = get_project_settings(project_name) + project_settings = get_project_settings(project_name) project_folder_structure = ( - get_project_settings["global"]["project_folder_structure"] + project_settings["global"]["project_folder_structure"] ) if not project_folder_structure: return { diff --git a/pype/modules/ftrack/events/event_user_assigment.py b/pype/modules/ftrack/events/event_user_assigment.py index f65c2334b0..9b0dfe84d1 100644 --- a/pype/modules/ftrack/events/event_user_assigment.py +++ b/pype/modules/ftrack/events/event_user_assigment.py @@ -200,9 +200,9 @@ class UserAssigmentEvent(BaseEvent): project_name = task_entity["project"]["full_name"] project_data = tmp_by_project_name.get(project_name) or {} if "scripts_by_action" not in project_data: - get_project_settings = get_project_settings(project_name) + project_settings = get_project_settings(project_name) _settings = ( - get_project_settings["ftrack"]["events"]["user_assignment"] + project_settings["ftrack"]["events"]["user_assignment"] ) project_data["scripts_by_action"] = _settings.get("scripts") tmp_by_project_name[project_name] = project_data diff --git a/pype/modules/ftrack/events/event_version_to_task_statuses.py b/pype/modules/ftrack/events/event_version_to_task_statuses.py index 39384e996e..0ea72be1cb 100644 --- a/pype/modules/ftrack/events/event_version_to_task_statuses.py +++ b/pype/modules/ftrack/events/event_version_to_task_statuses.py @@ -52,12 +52,11 @@ class VersionToTaskStatus(BaseEvent): project_entity = self.get_project_from_entity(task) project_name = project_entity["full_name"] - get_project_settings = get_project_settings(project_name) + project_settings = get_project_settings(project_name) # Load status mapping from presets status_mapping = ( - get_project_settings["ftrack"]["event"]["status_version_to_task"] - ) + project_settings["ftrack"]["events"]["status_version_to_task"]) # Skip if mapping is empty if not status_mapping: continue diff --git a/pype/plugins/maya/publish/extract_camera_mayaScene.py b/pype/plugins/maya/publish/extract_camera_mayaScene.py index a01c5885b0..0443357ba9 100644 --- a/pype/plugins/maya/publish/extract_camera_mayaScene.py +++ b/pype/plugins/maya/publish/extract_camera_mayaScene.py @@ -102,8 +102,8 @@ class ExtractCameraMayaScene(pype.api.Extractor): def process(self, instance): """Plugin entry point.""" # get settings - # TODO: load all settings directly, rather than passing them through context - ext_mapping = instance.context.data["presets"]["maya"].get("ext_mapping") # noqa: E501 + ext_mapping = (instance.context.data["presets"]["maya"] + .get("ext_mapping")) # noqa: E501 if ext_mapping: self.log.info("Looking in presets for scene type ...") # use extension mapping for first family found diff --git a/pype/plugins/maya/publish/submit_maya_muster.py b/pype/plugins/maya/publish/submit_maya_muster.py index 65889bf068..9c67b45721 100644 --- a/pype/plugins/maya/publish/submit_maya_muster.py +++ b/pype/plugins/maya/publish/submit_maya_muster.py @@ -27,7 +27,8 @@ def _get_template_id(renderer): templates = get_system_settings()["modules"]["Muster"]["templates_mapping"] if not templates: - raise RuntimeError(("Muster template mapping missing in pype-settings")) + raise RuntimeError(("Muster template mapping missing in " + "pype-settings")) try: template_id = templates[renderer] except KeyError: diff --git a/setup/maya/userSetup.py b/setup/maya/userSetup.py index e401580bd8..6ee008c5fc 100644 --- a/setup/maya/userSetup.py +++ b/setup/maya/userSetup.py @@ -14,7 +14,8 @@ shelf_preset = settings['maya'].get('project_shelf') if shelf_preset: project = os.environ["AVALON_PROJECT"] - icon_path = os.path.join(os.environ['PYPE_PROJECT_SCRIPTS'], project, "icons") + icon_path = os.path.join(os.environ['PYPE_PROJECT_SCRIPTS'], + project, "icons") icon_path = os.path.abspath(icon_path) for i in shelf_preset['imports']: