fixed imports to 2.0 in pype/ftrack

pype/api.py

@@ -15,7 +15,7 @@ from .action import (
     RepairContextAction
 )
 
-from app.api import Logger
+from pypeapp.api import Logger
 
 from . import (
     Anatomy,

pype/ftrack/actions/action_application_loader.py

@@ -2,10 +2,10 @@ import toml
 import time
 from pype.ftrack import AppAction
 from avalon import lib
-from app.api import Logger
+from pypeapp.api import Logger
 from pype import lib as pypelib
 
-log = Logger.getLogger(__name__)
+log = Logger().get_logger(__name__)
 
 
 def registerApp(app, session):

pype/ftrack/actions/action_asset_delete.py

@@ -1,7 +1,7 @@
 import sys
 import argparse
 import logging
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 
 

pype/ftrack/actions/action_client_review_sort.py

@@ -2,7 +2,7 @@ import sys
 import argparse
 import logging
 
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 
 

pype/ftrack/actions/action_component_open.py

@@ -3,7 +3,7 @@ import argparse
 import logging
 import subprocess
 import os
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 
 

pype/ftrack/actions/action_create_cust_attrs.py

@@ -2,10 +2,11 @@ import os
 import sys
 import argparse
 import json
-import ftrack_api
 import arrow
 import logging
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction, get_ca_mongoid
+from pypeapp.lib.config import get_presets
 
 """
 This action creates/updates custom attributes.
@@ -122,11 +123,6 @@ class CustomAttributes(BaseAction):
     def __init__(self, session):
         super().__init__(session)
 
-        templates = os.environ['PYPE_STUDIO_TEMPLATES']
-        path_items = [
-            templates, 'presets', 'ftrack', 'ftrack_custom_attributes.json'
-        ]
-        self.filepath = os.path.sep.join(path_items)
         self.types = {}
         self.object_type_ids = {}
         self.groups = {}
@@ -230,22 +226,12 @@ class CustomAttributes(BaseAction):
             self.process_attribute(data)
 
     def custom_attributes_from_file(self, session, event):
-        try:
-            with open(self.filepath) as data_file:
-                json_dict = json.load(data_file)
-        except Exception as e:
-            msg = (
-                'Loading "Custom attribute file" Failed.'
-                ' Please check log for more information'
-            )
-            self.log.warning("{} - {}".format(msg, str(e)))
-            self.show_message(event, msg)
-            return
+        presets = get_presets()['ftrack']['ftrack_custom_attributes']
 
-        for cust_attr_name in json_dict:
+        for cust_attr_name in presets:
             try:
                 data = {}
-                cust_attr = json_dict[cust_attr_name]
+                cust_attr = presets[cust_attr_name]
                 # Get key, label, type
                 data.update(self.get_required(cust_attr))
                 # Get hierachical/ entity_type/ object_id

pype/ftrack/actions/action_create_folders.py

@@ -4,7 +4,7 @@ import argparse
 import sys
 import errno
 
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 import json
 from pype import api as pype

pype/ftrack/actions/action_delete_asset.py

@@ -2,7 +2,7 @@ import sys
 import logging
 from bson.objectid import ObjectId
 import argparse
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 from avalon.tools.libraryloader.io_nonsingleton import DbConnector
 

pype/ftrack/actions/action_delete_asset_byname.py

@@ -1,7 +1,7 @@
 import sys
 import logging
 import argparse
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 from avalon.tools.libraryloader.io_nonsingleton import DbConnector
 

pype/ftrack/actions/action_delete_unpublished.py

@@ -1,7 +1,7 @@
 import sys
 import argparse
 import logging
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 
 

pype/ftrack/actions/action_djvview.py

@@ -5,12 +5,12 @@ import json
 import logging
 import subprocess
 from operator import itemgetter
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseHandler
 from app.api import Logger
 from pype import lib
 
-log = Logger.getLogger(__name__)
+log = Logger().get_logger(__name__)
 
 
 class DJVViewAction(BaseHandler):

pype/ftrack/actions/action_job_killer.py

@@ -1,10 +1,8 @@
-# :coding: utf-8
-# :copyright: Copyright (c) 2017 ftrack
 import sys
 import argparse
 import logging
 
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 
 

pype/ftrack/actions/action_set_version.py

@@ -1,7 +1,7 @@
 import sys
 import argparse
 import logging
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 
 

pype/ftrack/actions/action_sync_to_avalon_local.py

@@ -4,7 +4,7 @@ import argparse
 import logging
 import json
 
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction, lib as ftracklib
 
 

pype/ftrack/actions/action_test.py

@@ -6,7 +6,7 @@ import os
 import json
 import re
 
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 from avalon import io, inventory, schema
 

pype/ftrack/actions/action_thumbToChildern.py

@@ -3,7 +3,7 @@ import argparse
 import logging
 import json
 
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 
 

pype/ftrack/actions/action_thumbToParent.py

@@ -2,7 +2,7 @@ import sys
 import argparse
 import logging
 import json
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseAction
 
 

pype/ftrack/actions/event_collect_entities.py

@@ -1,4 +1,4 @@
-import ftrack_api
+from pype.vendor import ftrack_api
 from pype.ftrack import BaseEvent
 
 

pype/ftrack/credentials.py

@@ -77,7 +77,6 @@ def _check_credentials(username=None, apiKey=None):
         session = ftrack_api.Session()
         session.close()
     except Exception as e:
-        print(e)
         return False
 
     return True

pype/ftrack/ftrack_run.py

@@ -2,22 +2,16 @@ import os
 import json
 import threading
 import time
-import ftrack_api
-from app import style
-from app.vendor.Qt import QtCore, QtGui, QtWidgets
+from Qt import QtCore, QtGui, QtWidgets
 
-from pype.ftrack import credentials, login_dialog as login_dialog
-
-from pype.vendor.pynput import mouse, keyboard
-from . import FtrackServer
+from pype.vendor import ftrack_api
+from pypeapp import style
+from pype.ftrack import FtrackServer, credentials, login_dialog as login_dialog
 
 from pype import api as pype
 
 
-# load data from templates
-pype.load_data_from_templates()
-
-log = pype.Logger.getLogger(__name__, "ftrack")
+log = pype.Logger().get_logger(FtrackModule.__name__, "ftrack")
 
 
 class FtrackRunner:

pype/ftrack/ftrack_server/event_server.py

@@ -1,10 +1,10 @@
 import sys
 from pype.ftrack import credentials, login_dialog as login_dialog
 from pype.ftrack.ftrack_server import FtrackServer
-from app.vendor.Qt import QtWidgets
+from Qt import QtWidgets
 from pype import api
 
-log = api.Logger.getLogger(__name__, "ftrack-event-server")
+log = api.Logger().get_logger(__name__, "ftrack-event-server")
 
 
 class EventServer:

pype/ftrack/ftrack_server/event_server_cli.py

@@ -1,9 +1,9 @@
 import sys
 from pype.ftrack import credentials
 from pype.ftrack.ftrack_server import FtrackServer
-from app import api
+from pypeapp import api
 
-log = api.Logger.getLogger(__name__, "ftrack-event-server-cli")
+log = api.Logger().get_logger(__name__, "ftrack-event-server-cli")
 
 possible_yes = ['y', 'yes']
 possible_no = ['n', 'no']

pype/ftrack/ftrack_server/ftrack_server.py

@@ -2,12 +2,12 @@ import os
 import sys
 import types
 import importlib
-import ftrack_api
+from pype.vendor import ftrack_api
 import time
 import logging
-from app.api import Logger
+from pypeapp.api import Logger
 
-log = Logger.getLogger(__name__)
+log = Logger().get_logger(__name__)
 
 """
 # Required - Needed for connection to Ftrack

pype/ftrack/lib/avalon_sync.py

@@ -8,11 +8,11 @@ import avalon
 import avalon.api
 from avalon import schema
 from avalon.vendor import toml, jsonschema
-from app.api import Logger
+from pypeapp.api import Logger
 
 ValidationError = jsonschema.ValidationError
 
-log = Logger.getLogger(__name__)
+log = Logger().get_logger(__name__)
 
 
 def get_ca_mongoid():

pype/ftrack/lib/ftrack_base_handler.py

@@ -1,7 +1,7 @@
-import ftrack_api
 import functools
 import time
 from pype import api as pype
+from pype.vendor import ftrack_api
 
 
 class MissingPermision(Exception):
@@ -27,7 +27,7 @@ class BaseHandler(object):
     def __init__(self, session):
         '''Expects a ftrack_api.Session instance'''
         self._session = session
-        self.log = pype.Logger.getLogger(self.__class__.__name__)
+        self.log = pype.Logger().get_logger(self.__class__.__name__)
 
         # Using decorator
         self.register = self.register_decorator(self.register)

pype/ftrack/login_dialog.py

@@ -1,7 +1,7 @@
 import os
 import requests
-from app.vendor.Qt import QtCore, QtGui, QtWidgets
-from app import style
+from Qt import QtCore, QtGui, QtWidgets
+from pypeapp import style
 from . import credentials, login_tools
 
 

pype/ftrack/login_tools.py

@@ -5,7 +5,7 @@ import webbrowser
 import functools
 import pype
 import inspect
-from app.vendor.Qt import QtCore
+from Qt import QtCore
 
 
 class LoginServerHandler(BaseHTTPRequestHandler):

pype/templates.py

@@ -3,8 +3,9 @@ import re
 from avalon import io
 from avalon import api as avalon
 from . import lib
-from app.api import (Templates, Logger, format)
-log = Logger.getLogger(__name__,
+# from pypeapp.api import (Templates, Logger, format)
+from pypeapp.api import Logger
+log = Logger().get_logger(__name__,
                        os.getenv("AVALON_APP", "pype-config"))
 
 SESSION = None