From e376900d6854673dd5ac80ecc21d27abf9941303 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakub@orbi.tools>
Date: Tue, 13 Apr 2021 17:51:29 +0200
Subject: [PATCH] Hiero: hound fixes

---
 openpype/hosts/hiero/otio/hiero_export.py      |  2 +-
 openpype/hosts/hiero/otio/hiero_import.py      |  2 +-
 .../plugins/publish/precollect_instances.py    | 18 +++++++++---------
 .../precollect_instances.py                    |  1 -
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/hiero/otio/hiero_export.py b/openpype/hosts/hiero/otio/hiero_export.py
index 93ddee7b38..6e751d3aa4 100644
--- a/openpype/hosts/hiero/otio/hiero_export.py
+++ b/openpype/hosts/hiero/otio/hiero_export.py
@@ -175,7 +175,7 @@ def create_otio_markers(otio_item, item):
             _key = key.replace("tag.", "")
 
             try:
-            # capture exceptions which are related to strings only
+                # capture exceptions which are related to strings only
                 _value = ast.literal_eval(value)
             except (ValueError, SyntaxError):
                 _value = value
diff --git a/openpype/hosts/hiero/otio/hiero_import.py b/openpype/hosts/hiero/otio/hiero_import.py
index b5040a32c7..257c434011 100644
--- a/openpype/hosts/hiero/otio/hiero_import.py
+++ b/openpype/hosts/hiero/otio/hiero_import.py
@@ -117,7 +117,7 @@ def apply_transition(otio_track, otio_item, track):
             transition = None
             warning = (
                 "Unable to apply transition \"{t.name}\": {e} "
-                "Ignoring the transition.").format(t=otio_item, e=e.message)
+                "Ignoring the transition.").format(t=otio_item, e=str(e))
 
     elif transition_type == 'fade_in':
         transition_func = getattr(
diff --git a/openpype/hosts/hiero/plugins/publish/precollect_instances.py b/openpype/hosts/hiero/plugins/publish/precollect_instances.py
index 63585b387e..f054971c42 100644
--- a/openpype/hosts/hiero/plugins/publish/precollect_instances.py
+++ b/openpype/hosts/hiero/plugins/publish/precollect_instances.py
@@ -6,8 +6,8 @@ from openpype.hosts.hiero.otio import hiero_export
 
 # # developer reload modules
 from pprint import pformat
-reload(lib)
-reload(phiero)
+# reload(lib)
+# reload(phiero)
 
 
 class PrecollectInstances(pyblish.api.ContextPlugin):
@@ -20,7 +20,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
     def process(self, context):
         otio_timeline = context.data["otioTimeline"]
         selected_timeline_items = phiero.get_track_items(
-                selected=True, check_enabled=True, check_tagged=True)
+            selected=True, check_enabled=True, check_tagged=True)
         self.log.info(
             "Processing enabled track items: {}".format(
                 selected_timeline_items))
@@ -39,8 +39,6 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             if tag_data.get("id") != "pyblish.avalon.instance":
                 continue
 
-            clip = track_item.source()
-
             # add tag data to instance data
             data.update({
                 k: v for k, v in tag_data.items()
@@ -95,16 +93,18 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
                 "resolutionWidth": otio_clip_metadata[
                         "openpype.source.width"],
                 "resolutionHeight": otio_clip_metadata[
-                        "openpype.source.height"],
+                    "openpype.source.height"],
                 "pixelAspect": otio_clip_metadata[
-                        "openpype.source.pixelAspect"]
+                    "openpype.source.pixelAspect"]
             })
         else:
             otio_tl_metadata = context.data["otioTimeline"].metadata
             data.update({
                 "resolutionWidth": otio_tl_metadata["openpype.timeline.width"],
-                "resolutionHeight": otio_tl_metadata["openpype.timeline.height"],
-                "pixelAspect": otio_tl_metadata["openpype.timeline.pixelAspect"]
+                "resolutionHeight": otio_tl_metadata[
+                    "openpype.timeline.height"],
+                "pixelAspect": otio_tl_metadata[
+                    "openpype.timeline.pixelAspect"]
             })
 
     def create_shot_instance(self, context, **data):
diff --git a/openpype/hosts/hiero/plugins/publish_old_workflow/precollect_instances.py b/openpype/hosts/hiero/plugins/publish_old_workflow/precollect_instances.py
index 2b769afee1..f9cc158e79 100644
--- a/openpype/hosts/hiero/plugins/publish_old_workflow/precollect_instances.py
+++ b/openpype/hosts/hiero/plugins/publish_old_workflow/precollect_instances.py
@@ -14,7 +14,6 @@ class PreCollectInstances(api.ContextPlugin):
     label = "Pre-collect Instances"
     hosts = ["hiero"]
 
-
     def process(self, context):
         track_items = phiero.get_track_items(
             selected=True, check_tagged=True, check_enabled=True)