From fb81acfc8ff8da86f9b96dbe402302db2a2ad300 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jezschaj@gmail.com>
Date: Wed, 13 Feb 2019 16:22:29 -0100
Subject: [PATCH 1/2] moving ftrack plugins into publish folder

---
 pype/plugins/ftrack/{ => publish}/collect_ftrack_api.py         | 0
 pype/plugins/ftrack/{ => publish}/integrate_ftrack_api.py       | 0
 pype/plugins/ftrack/{ => publish}/integrate_ftrack_instances.py | 0
 pype/plugins/ftrack/{ => publish}/integrate_ftrack_review.py    | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename pype/plugins/ftrack/{ => publish}/collect_ftrack_api.py (100%)
 rename pype/plugins/ftrack/{ => publish}/integrate_ftrack_api.py (100%)
 rename pype/plugins/ftrack/{ => publish}/integrate_ftrack_instances.py (100%)
 rename pype/plugins/ftrack/{ => publish}/integrate_ftrack_review.py (100%)

diff --git a/pype/plugins/ftrack/collect_ftrack_api.py b/pype/plugins/ftrack/publish/collect_ftrack_api.py
similarity index 100%
rename from pype/plugins/ftrack/collect_ftrack_api.py
rename to pype/plugins/ftrack/publish/collect_ftrack_api.py
diff --git a/pype/plugins/ftrack/integrate_ftrack_api.py b/pype/plugins/ftrack/publish/integrate_ftrack_api.py
similarity index 100%
rename from pype/plugins/ftrack/integrate_ftrack_api.py
rename to pype/plugins/ftrack/publish/integrate_ftrack_api.py
diff --git a/pype/plugins/ftrack/integrate_ftrack_instances.py b/pype/plugins/ftrack/publish/integrate_ftrack_instances.py
similarity index 100%
rename from pype/plugins/ftrack/integrate_ftrack_instances.py
rename to pype/plugins/ftrack/publish/integrate_ftrack_instances.py
diff --git a/pype/plugins/ftrack/integrate_ftrack_review.py b/pype/plugins/ftrack/publish/integrate_ftrack_review.py
similarity index 100%
rename from pype/plugins/ftrack/integrate_ftrack_review.py
rename to pype/plugins/ftrack/publish/integrate_ftrack_review.py

From e1b16637281beb99a3f67768346675ed8911339f Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jezschaj@gmail.com>
Date: Wed, 13 Feb 2019 16:37:46 -0100
Subject: [PATCH 2/2] fixing importing module ftrack_api for different python
 versions

---
 pype/plugins/ftrack/publish/collect_ftrack_api.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pype/plugins/ftrack/publish/collect_ftrack_api.py b/pype/plugins/ftrack/publish/collect_ftrack_api.py
index 7afa4d50a0..f5e1cfd950 100644
--- a/pype/plugins/ftrack/publish/collect_ftrack_api.py
+++ b/pype/plugins/ftrack/publish/collect_ftrack_api.py
@@ -1,8 +1,11 @@
 import os
-
-import ftrack_api_old as ftrack_api
 import pyblish.api
 
+try:
+    import ftrack_api_old as ftrack_api
+except Exception:
+    import ftrack_api
+
 
 class CollectFtrackApi(pyblish.api.ContextPlugin):
     """ Collects an ftrack session and the current task id. """