From e9b7501a1730f3bf65871a2cf0120b591d74c8cf Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Thu, 10 Feb 2022 12:58:50 +0100 Subject: [PATCH] addressing PR comments --- openpype/hosts/flame/api/pipeline.py | 7 +++---- openpype/hosts/flame/api/plugin.py | 15 ++------------- .../openpype_flame_to_ftrack.py | 6 +++--- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/openpype/hosts/flame/api/pipeline.py b/openpype/hosts/flame/api/pipeline.py index 476a65e59b..21cb7422de 100644 --- a/openpype/hosts/flame/api/pipeline.py +++ b/openpype/hosts/flame/api/pipeline.py @@ -6,7 +6,6 @@ import contextlib from avalon import api as avalon from avalon.pipeline import AVALON_CONTAINER_ID from pyblish import api as pyblish -from collections import OrderedDict from openpype.api import Logger from .lib import ( set_segment_data_marker, @@ -77,18 +76,18 @@ def containerise(flame_clip, loader=None, data=None): - data_imprint = OrderedDict({ + data_imprint = { "schema": "openpype:container-2.0", "id": AVALON_CONTAINER_ID, "name": str(name), "namespace": str(namespace), "loader": str(loader), "representation": str(context["representation"]["_id"]), - }) + } if data: for k, v in data.items(): - data_imprint.update({k: v}) + data_imprint[k] = v log.debug("_ data_imprint: {}".format(data_imprint)) diff --git a/openpype/hosts/flame/api/plugin.py b/openpype/hosts/flame/api/plugin.py index c28ab0f556..aba83c543a 100644 --- a/openpype/hosts/flame/api/plugin.py +++ b/openpype/hosts/flame/api/plugin.py @@ -4,7 +4,6 @@ import shutil import sys from avalon.vendor import qargparse from xml.etree import ElementTree as ET -import shutil import six from Qt import QtWidgets, QtCore import openpype.api as openpype @@ -680,16 +679,6 @@ class ClipLoader(avalon.Loader): ): pass - def update(self, container, representation): - """Update an existing `container` - """ - pass - - def remove(self, container): - """Remove an existing `container` - """ - pass - class OpenClipSolver: media_script_path = "/opt/Autodesk/mio/current/dl_get_media_info" @@ -734,7 +723,7 @@ class OpenClipSolver: self.log.info("Temp File: {}".format(self.tmp_file)) def make(self): - self._get_media_info_args() + self._generate_media_info_file() if self.create_new_clip: # New openClip @@ -747,7 +736,7 @@ class OpenClipSolver: raise IOError("Media Scirpt does not exist: `{}`".format( self.media_script_path)) - def _get_media_info_args(self): + def _generate_media_info_file(self): # Create cmd arguments for gettig xml file info file cmd_args = [ self.media_script_path, diff --git a/openpype/hosts/flame/api/utility_scripts/openpype_flame_to_ftrack/openpype_flame_to_ftrack.py b/openpype/hosts/flame/api/utility_scripts/openpype_flame_to_ftrack/openpype_flame_to_ftrack.py index ecc16fde6e..65c1840a72 100644 --- a/openpype/hosts/flame/api/utility_scripts/openpype_flame_to_ftrack/openpype_flame_to_ftrack.py +++ b/openpype/hosts/flame/api/utility_scripts/openpype_flame_to_ftrack/openpype_flame_to_ftrack.py @@ -4,9 +4,9 @@ import os import sys try: - import six -except ImportError: - raise ImportError("Cannot import this module") + import six # noqa +except ImportError as msg: + raise ImportError("Cannot import this module: {}".format(msg)) from msg SCRIPT_DIR = os.path.dirname(__file__) PACKAGE_DIR = os.path.join(SCRIPT_DIR, "modules")