From 2bb789c413ccdb5c75f0eb027d51fb8c3edb3b2d Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Tue, 9 Apr 2019 18:22:55 +0200 Subject: [PATCH] logger fixes --- pype/aport/__init__.py | 2 +- pype/aport/api.py | 2 +- pype/aport/pipeline.py | 2 +- pype/aport/templates.py | 2 +- pype/lib.py | 12 +++++++----- pype/nuke/templates.py | 2 +- pype/plugins/nuke/create/create_read.py | 2 +- pype/plugins/nuke/create/create_write.py | 3 ++- pype/plugins/nuke/load/actions.py | 2 +- pype/plugins/nuke/load/load_sequence.py | 2 +- pype/plugins/nuke/publish/collect_reads.py | 2 +- pype/plugins/nuke/publish/collect_writes.py | 2 +- pype/premiere/__init__.py | 2 +- pype/premiere/templates.py | 2 +- setup/nuke/nuke_path/menu.py | 8 ++++---- 15 files changed, 25 insertions(+), 22 deletions(-) diff --git a/pype/aport/__init__.py b/pype/aport/__init__.py index 4efcb731c7..acab2d3770 100644 --- a/pype/aport/__init__.py +++ b/pype/aport/__init__.py @@ -7,7 +7,7 @@ from app import api as app from .. import api -log = api.Logger.getLogger(__name__, "aport") +log = api.Logger.get_logger(__name__, "aport") AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype") diff --git a/pype/aport/api.py b/pype/aport/api.py index 4d202b6e7a..bbd7c814c3 100644 --- a/pype/aport/api.py +++ b/pype/aport/api.py @@ -19,7 +19,7 @@ from app.api import forward from pype import api as pype -log = pype.Logger.getLogger(__name__, "aport") +log = pype.Logger.get_logger(__name__, "aport") SESSION = avalon.session diff --git a/pype/aport/pipeline.py b/pype/aport/pipeline.py index dee41aff34..458a60241f 100644 --- a/pype/aport/pipeline.py +++ b/pype/aport/pipeline.py @@ -20,7 +20,7 @@ for name, handler in [(handler.get_name(), handler) if "pype" not in str(name).lower(): pype.Logger.logging.root.removeHandler(handler) -log = pype.Logger.getLogger(__name__, "aport") +log = pype.Logger.get_logger(__name__, "aport") SESSION = avalon.session diff --git a/pype/aport/templates.py b/pype/aport/templates.py index 5be6e276ba..b9d8e708ea 100644 --- a/pype/aport/templates.py +++ b/pype/aport/templates.py @@ -1,6 +1,6 @@ from pype import api as pype -log = pype.Logger.getLogger(__name__, "aport") +log = pype.Logger.get_logger(__name__, "aport") def get_anatomy(**kwarg): diff --git a/pype/lib.py b/pype/lib.py index 48f14fe6c4..ece5a01e22 100644 --- a/pype/lib.py +++ b/pype/lib.py @@ -420,7 +420,9 @@ def get_avalon_project_template_schema(): def get_avalon_project_template(): - from app.api import Templates + # from app.api import Templates + + from pypeapp import Anatomy """ Get avalon template @@ -428,11 +430,11 @@ def get_avalon_project_template(): Returns: dictionary with templates """ - template = Templates(type=["anatomy"]) + anatomy = Anatomy(project_name=os.environ.get('AVALON_PROJECT')).anatomy proj_template = {} - proj_template['workfile'] = template.anatomy.avalon.workfile - proj_template['work'] = template.anatomy.avalon.work - proj_template['publish'] = template.anatomy.avalon.publish + proj_template['workfile'] = anatomy["avalon"]["workfile"] + proj_template['work'] = anatomy["avalon"]["work"] + proj_template['publish'] = anatomy["avalon"]["publish"] return proj_template diff --git a/pype/nuke/templates.py b/pype/nuke/templates.py index 16cb6062a2..4be350cbcb 100644 --- a/pype/nuke/templates.py +++ b/pype/nuke/templates.py @@ -1,6 +1,6 @@ from pype import api as pype -log = pype.Logger.getLogger(__name__, "nuke") +log = pype.Logger().get_logger(__name__, "nuke") def get_anatomy(**kwarg): diff --git a/pype/plugins/nuke/create/create_read.py b/pype/plugins/nuke/create/create_read.py index 8597737167..8ab902cfc0 100644 --- a/pype/plugins/nuke/create/create_read.py +++ b/pype/plugins/nuke/create/create_read.py @@ -6,7 +6,7 @@ from pype import api as pype import nuke -log = pype.Logger.getLogger(__name__, "nuke") +log = pype.Logger.get_logger(__name__, "nuke") class CrateRead(avalon.nuke.Creator): diff --git a/pype/plugins/nuke/create/create_write.py b/pype/plugins/nuke/create/create_write.py index af7462680e..83e6b043ed 100644 --- a/pype/plugins/nuke/create/create_write.py +++ b/pype/plugins/nuke/create/create_write.py @@ -5,11 +5,12 @@ from pype.nuke import ( create_write_node ) from pype import api as pype +# from pypeapp import Logger import nuke -log = pype.Logger.getLogger(__name__, "nuke") +log = pype.Logger().get_logger(__name__, "nuke") def subset_to_families(subset, family, families): diff --git a/pype/plugins/nuke/load/actions.py b/pype/plugins/nuke/load/actions.py index 449567987a..917e7e71b0 100644 --- a/pype/plugins/nuke/load/actions.py +++ b/pype/plugins/nuke/load/actions.py @@ -5,7 +5,7 @@ from avalon import api from pype.api import Logger -log = Logger.getLogger(__name__, "nuke") +log = Logger().get_logger(__name__, "nuke") class SetFrameRangeLoader(api.Loader): diff --git a/pype/plugins/nuke/load/load_sequence.py b/pype/plugins/nuke/load/load_sequence.py index a4a591e657..c82d697541 100644 --- a/pype/plugins/nuke/load/load_sequence.py +++ b/pype/plugins/nuke/load/load_sequence.py @@ -8,7 +8,7 @@ import avalon.io as io import nuke from pype.api import Logger -log = Logger.getLogger(__name__, "nuke") +log = Logger.get_looger(__name__, "nuke") @contextlib.contextmanager diff --git a/pype/plugins/nuke/publish/collect_reads.py b/pype/plugins/nuke/publish/collect_reads.py index f5d3008b40..75ea2efa3a 100644 --- a/pype/plugins/nuke/publish/collect_reads.py +++ b/pype/plugins/nuke/publish/collect_reads.py @@ -6,7 +6,7 @@ import pyblish.api import logging from avalon import io, api -log = logging.getLogger(__name__) +log = logging.get_logger(__name__) @pyblish.api.log diff --git a/pype/plugins/nuke/publish/collect_writes.py b/pype/plugins/nuke/publish/collect_writes.py index 2a274201bb..612c2a8775 100644 --- a/pype/plugins/nuke/publish/collect_writes.py +++ b/pype/plugins/nuke/publish/collect_writes.py @@ -6,7 +6,7 @@ import logging import pype.api as pype -log = logging.getLogger(__name__) +log = logging.get_logger(__name__) @pyblish.api.log diff --git a/pype/premiere/__init__.py b/pype/premiere/__init__.py index 3d6610795e..2fe583bb55 100644 --- a/pype/premiere/__init__.py +++ b/pype/premiere/__init__.py @@ -12,7 +12,7 @@ from .. import api import requests -log = api.Logger.getLogger(__name__, "premiere") +log = api.Logger.get_logger(__name__, "premiere") AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype") EXTENSIONS_PATH_LOCAL = os.getenv("EXTENSIONS_PATH", None) diff --git a/pype/premiere/templates.py b/pype/premiere/templates.py index 33a7a6ff61..1a426c0d5d 100644 --- a/pype/premiere/templates.py +++ b/pype/premiere/templates.py @@ -1,6 +1,6 @@ from pype import api as pype -log = pype.Logger.getLogger(__name__, "premiere") +log = pype.Logger.get_logger(__name__, "premiere") def get_anatomy(**kwarg): diff --git a/setup/nuke/nuke_path/menu.py b/setup/nuke/nuke_path/menu.py index 45f44d0d11..9a96a52850 100644 --- a/setup/nuke/nuke_path/menu.py +++ b/setup/nuke/nuke_path/menu.py @@ -1,12 +1,12 @@ from pype.nuke.lib import writes_version_sync, onScriptLoad import nuke -from pype.api import Logger +from pypeapp import Logger -log = Logger.getLogger(__name__, "nuke") +log = Logger().get_logger(__name__, "nuke") -# nuke.addOnScriptSave(writes_version_sync) -# nuke.addOnScriptSave(onScriptLoad) +nuke.addOnScriptSave(writes_version_sync) +nuke.addOnScriptSave(onScriptLoad) log.info('Automatic syncing of write file knob to script version')