From 3a7ec9abe091dc3e4f1ee2342b0c97f7ae20e32e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 28 Jan 2019 18:07:24 +0100
Subject: [PATCH] fixed wrong lib importing

---
 .../actions/action_sync_to_avalon_local.py       | 16 ++++++++--------
 pype/ftrack/lib/avalon_sync.py                   | 12 ++++++------
 pype/ftrack/lib/ftrack_app_handler.py            |  6 +++---
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pype/ftrack/actions/action_sync_to_avalon_local.py b/pype/ftrack/actions/action_sync_to_avalon_local.py
index f4585240d6..97ab49a272 100644
--- a/pype/ftrack/actions/action_sync_to_avalon_local.py
+++ b/pype/ftrack/actions/action_sync_to_avalon_local.py
@@ -5,7 +5,7 @@ import logging
 import json
 
 import ftrack_api
-from pype.ftrack import BaseAction, lib
+from pype.ftrack import BaseAction, lib as ftracklib
 
 
 class SyncToAvalon(BaseAction):
@@ -117,12 +117,12 @@ class SyncToAvalon(BaseAction):
             all_names = []
             duplicates = []
 
-            for e in self.importable:
-                lib.avalon_check_name(e)
-                if e['name'] in all_names:
+            for entity in self.importable:
+                ftracklib.avalon_check_name(entity)
+                if entity['name'] in all_names:
                     duplicates.append("'{}'".format(e['name']))
                 else:
-                    all_names.append(e['name'])
+                    all_names.append(entity['name'])
 
             if len(duplicates) > 0:
                 raise ValueError(
@@ -132,12 +132,12 @@ class SyncToAvalon(BaseAction):
             # ----- PROJECT ------
             # store Ftrack project- self.importable[0] must be project entity!!
             ft_project = self.importable[0]
-            avalon_project = lib.get_avalon_project(ft_project)
-            custom_attributes = lib.get_avalon_attr(session)
+            avalon_project = ftracklib.get_avalon_project(ft_project)
+            custom_attributes = ftracklib.get_avalon_attr(session)
 
             # Import all entities to Avalon DB
             for entity in self.importable:
-                result = lib.import_to_avalon(
+                result = ftracklib.import_to_avalon(
                     session=session,
                     entity=entity,
                     ft_project=ft_project,
diff --git a/pype/ftrack/lib/avalon_sync.py b/pype/ftrack/lib/avalon_sync.py
index 5d7ce05f33..fea07ec7dc 100644
--- a/pype/ftrack/lib/avalon_sync.py
+++ b/pype/ftrack/lib/avalon_sync.py
@@ -1,7 +1,7 @@
 import os
 import re
 import json
-from pype import lib
+from pype import lib as pypelib
 from pype.lib import get_avalon_database
 from bson.objectid import ObjectId
 import avalon
@@ -62,7 +62,7 @@ def import_to_avalon(
         ft_project_code = ft_project['name']
 
         if av_project is None:
-            project_schema = lib.get_avalon_project_template_schema()
+            project_schema = pypelib.get_avalon_project_template_schema()
             item = {
                 'schema': project_schema,
                 'type': type,
@@ -188,7 +188,7 @@ def import_to_avalon(
             {'type': 'asset', 'name': name}
         )
         if avalon_asset is None:
-            asset_schema = lib.get_avalon_asset_template_schema()
+            asset_schema = pypelib.get_avalon_asset_template_schema()
             item = {
                 'schema': asset_schema,
                 'name': name,
@@ -437,10 +437,10 @@ def get_avalon_project(ft_project):
 
 def get_project_config(entity):
     config = {}
-    config['schema'] = lib.get_avalon_project_config_schema()
+    config['schema'] = pypelib.get_avalon_project_config_schema()
     config['tasks'] = [{'name': ''}]
     config['apps'] = get_project_apps(entity)
-    config['template'] = lib.get_avalon_project_template()
+    config['template'] = pypelib.get_avalon_project_template()
 
     return config
 
@@ -502,7 +502,7 @@ def avalon_check_name(entity, inSchema=None):
 
 
 def get_config_data():
-    path_items = [lib.get_presets_path(), 'ftrack', 'ftrack_config.json']
+    path_items = [pypelib.get_presets_path(), 'ftrack', 'ftrack_config.json']
     filepath = os.path.sep.join(path_items)
     data = dict()
     try:
diff --git a/pype/ftrack/lib/ftrack_app_handler.py b/pype/ftrack/lib/ftrack_app_handler.py
index 15b426daee..32ccb96ba6 100644
--- a/pype/ftrack/lib/ftrack_app_handler.py
+++ b/pype/ftrack/lib/ftrack_app_handler.py
@@ -3,7 +3,7 @@
 import os
 import sys
 import platform
-from avalon import lib
+from avalon import lib as avalonlib
 import acre
 from pype import api as pype
 from pype import lib as pypelib
@@ -240,7 +240,7 @@ class AppAction(BaseHandler):
 
             # Run SW if was found executable
             if execfile is not None:
-                lib.launch(executable=execfile, args=[], environment=env)
+                avalonlib.launch(executable=execfile, args=[], environment=env)
             else:
                 return {
                     'success': False,
@@ -283,7 +283,7 @@ class AppAction(BaseHandler):
                 pass
             # Run SW if was found executable
             if execfile is not None:
-                lib.launch(
+                avalonlib.launch(
                     '/usr/bin/env', args=['bash', execfile], environment=env
                 )
             else: