mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-24 21:04:40 +01:00
fix imports in lib
This commit is contained in:
parent
604968d0b3
commit
1fee2d524c
4 changed files with 10 additions and 9 deletions
|
|
@ -4,7 +4,8 @@ import os
|
|||
import functools
|
||||
import logging
|
||||
|
||||
pyblish = avalon = config = Anatomy = filter_pyblish_plugins = None
|
||||
pyblish = avalon = filter_pyblish_plugins = None
|
||||
get_project_settings = Anatomy = None
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -27,14 +28,14 @@ def import_wrapper(func):
|
|||
def decorated(*args, **kwargs):
|
||||
global pyblish
|
||||
global avalon
|
||||
global config
|
||||
global get_project_settings
|
||||
global Anatomy
|
||||
global filter_pyblish_plugins
|
||||
global _original_discover
|
||||
if pyblish is None:
|
||||
from pyblish import api as pyblish
|
||||
from avalon import api as avalon
|
||||
from .api import Anatomy, config
|
||||
from .api import Anatomy, get_project_settings
|
||||
from .lib import filter_pyblish_plugins
|
||||
|
||||
# we are monkey patching `avalon.api.discover()` to allow us to
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ from abc import ABCMeta, abstractmethod
|
|||
import six
|
||||
|
||||
from pype.settings import get_system_settings, get_environments
|
||||
from ..api import Logger
|
||||
from . import PypeLogger
|
||||
|
||||
from .python_module_tools import (
|
||||
modules_from_path,
|
||||
|
|
@ -132,7 +132,7 @@ def _subprocess(*args, **kwargs):
|
|||
|
||||
class ApplicationManager:
|
||||
def __init__(self):
|
||||
self.log = Logger().get_logger(self.__class__.__name__)
|
||||
self.log = PypeLogger().get_logger(self.__class__.__name__)
|
||||
|
||||
self.applications = {}
|
||||
self.tools = {}
|
||||
|
|
@ -379,7 +379,7 @@ class LaunchHook:
|
|||
|
||||
Always should be called
|
||||
"""
|
||||
self.log = Logger().get_logger(self.__class__.__name__)
|
||||
self.log = PypeLogger().get_logger(self.__class__.__name__)
|
||||
|
||||
self.launch_context = launch_context
|
||||
|
||||
|
|
@ -513,7 +513,7 @@ class ApplicationLaunchContext:
|
|||
|
||||
# Logger
|
||||
logger_name = "{}-{}".format(self.__class__.__name__, self.app_name)
|
||||
self.log = Logger().get_logger(logger_name)
|
||||
self.log = PypeLogger().get_logger(logger_name)
|
||||
|
||||
self.executable = executable
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import logging
|
|||
import collections
|
||||
import functools
|
||||
|
||||
from . import config
|
||||
from pype.settings import get_project_settings
|
||||
|
||||
|
||||
log = logging.getLogger("AvalonContext")
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import os
|
|||
import inspect
|
||||
import logging
|
||||
|
||||
from ..api import get_project_settings
|
||||
from pype.settings import get_project_settings
|
||||
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue