From ec1e9a67c78c0199c2cb15f7c4f3282d565a73a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= Date: Mon, 23 Nov 2020 13:20:10 +0100 Subject: [PATCH] revert messed imports 2 --- .../clockify/launcher_actions/ClockifySync.py | 4 +-- pype/modules/ftrack/lib/avalon_sync.py | 22 ++++++++-------- pype/modules/logging/tray/gui/models.py | 2 +- .../publish/integrate_hierarchy_ftrack.py | 3 +-- pype/plugins/fusion/load/load_sequence.py | 5 ++-- pype/plugins/fusion/publish/render_local.py | 4 +-- .../plugins/fusion/publish/submit_deadline.py | 7 +++--- .../global/publish/collect_avalon_entities.py | 2 +- .../publish/collect_current_pype_user.py | 3 +-- pype/plugins/global/publish/extract_burnin.py | 3 +-- .../publish/extract_hierarchy_avalon.py | 4 +-- pype/plugins/global/publish/extract_jpeg.py | 1 - pype/plugins/global/publish/extract_review.py | 8 +++--- .../global/publish/extract_scanline_exr.py | 1 - pype/plugins/global/publish/integrate_new.py | 25 +++++++++---------- .../global/publish/submit_publish_job.py | 5 ++-- .../validate_custom_ftrack_attributes.py | 1 - pype/plugins/harmony/load/load_background.py | 4 +-- .../harmony/load/load_imagesequence.py | 2 +- .../harmony/load/load_template_workfile.py | 4 +-- .../harmony/publish/extract_palette.py | 1 - .../plugins/harmony/publish/extract_render.py | 6 ++--- .../harmony/publish/extract_template.py | 3 +-- .../harmony/publish/extract_workfile.py | 3 +-- .../plugins/harmony/publish/validate_audio.py | 1 + .../publish/validate_scene_settings.py | 2 +- .../hiero/_unused/collect_timecodes.py | 2 +- .../hiero/_unused/collect_workfile_version.py | 2 -- .../hiero/_unused/extract_plates_waiting.py | 3 +-- .../hiero/_unused/validate_viewer_lut.py | 3 +++ ...load_sequences_to_timeline_asset_origin.py | 4 +-- .../hiero/publish/collect_assetbuilds.py | 2 +- pype/plugins/hiero/publish/collect_audio.py | 4 +-- .../hiero/publish/collect_calculate_retime.py | 5 ++-- pype/plugins/hiero/publish/collect_clips.py | 5 ++-- .../hiero/publish/collect_colorspace.py | 2 ++ pype/plugins/hiero/publish/collect_effects.py | 3 +-- .../publish/collect_hierarchy_context.py | 5 ++-- pype/plugins/hiero/publish/collect_review.py | 3 +-- .../hiero/publish/collect_selection.py | 3 ++- .../plugins/hiero/publish/collect_sequence.py | 2 +- .../hiero/publish/collect_tag_framestart.py | 2 +- .../hiero/publish/collect_tag_handles.py | 1 - pype/plugins/hiero/publish/extract_audio.py | 1 - pype/plugins/hiero/publish/extract_effects.py | 7 +++--- .../hiero/publish/version_up_workfile.py | 1 - pype/plugins/maya/create/create_render.py | 8 +++--- pype/plugins/maya/load/load_look.py | 12 ++++----- pype/plugins/maya/publish/collect_render.py | 13 +++++----- .../maya/publish/collect_yeti_cache.py | 3 ++- .../maya/publish/submit_maya_deadline.py | 19 +++++++------- pype/plugins/nuke/create/create_camera.py | 2 +- pype/plugins/nuke/load/load_backdrop.py | 8 +++--- pype/plugins/nuke/load/load_camera_abc.py | 4 +-- pype/plugins/nuke/publish/extract_camera.py | 10 +++----- .../publish/collect_instance_data.py | 2 +- 56 files changed, 123 insertions(+), 144 deletions(-) diff --git a/pype/modules/clockify/launcher_actions/ClockifySync.py b/pype/modules/clockify/launcher_actions/ClockifySync.py index 9448d2748f..422a346023 100644 --- a/pype/modules/clockify/launcher_actions/ClockifySync.py +++ b/pype/modules/clockify/launcher_actions/ClockifySync.py @@ -1,8 +1,6 @@ from avalon import api, io - -from pype.api import Logger from pype.modules.clockify.clockify_api import ClockifyAPI - +from pype.api import Logger log = Logger().get_logger(__name__, "clockify_sync") diff --git a/pype/modules/ftrack/lib/avalon_sync.py b/pype/modules/ftrack/lib/avalon_sync.py index c3cd9e3aad..7ff5283d6a 100644 --- a/pype/modules/ftrack/lib/avalon_sync.py +++ b/pype/modules/ftrack/lib/avalon_sync.py @@ -1,22 +1,24 @@ +import os +import re +import queue +import json import collections import copy -import json -import os -import queue -import re + +from avalon.api import AvalonMongoDB import avalon import avalon.api -import ftrack_api -from avalon.api import AvalonMongoDB from avalon.vendor import toml -from bson.errors import InvalidId -from bson.objectid import ObjectId -from pymongo import UpdateOne - from pype.api import Logger, Anatomy + +from bson.objectid import ObjectId +from bson.errors import InvalidId +from pymongo import UpdateOne +import ftrack_api from pype.api import config + log = Logger().get_logger(__name__) diff --git a/pype/modules/logging/tray/gui/models.py b/pype/modules/logging/tray/gui/models.py index 3591f3dde2..ae2666f501 100644 --- a/pype/modules/logging/tray/gui/models.py +++ b/pype/modules/logging/tray/gui/models.py @@ -1,7 +1,7 @@ import collections from Qt import QtCore, QtGui from pype.api import Logger -from pype.lib.log import _bootstrap_mongo_log, LOG_COLLECTION_NAME +from pypeapp.lib.log import _bootstrap_mongo_log, LOG_COLLECTION_NAME log = Logger().get_logger("LogModel", "LoggingModule") diff --git a/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py b/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py index 48e0e92bec..e4496138bb 100644 --- a/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py +++ b/pype/plugins/ftrack/publish/integrate_hierarchy_ftrack.py @@ -1,7 +1,6 @@ import sys - -import pyblish.api import six +import pyblish.api from avalon import io try: diff --git a/pype/plugins/fusion/load/load_sequence.py b/pype/plugins/fusion/load/load_sequence.py index 3157234e28..24d48fb9da 100644 --- a/pype/plugins/fusion/load/load_sequence.py +++ b/pype/plugins/fusion/load/load_sequence.py @@ -1,8 +1,9 @@ -import contextlib import os +import contextlib -import avalon.io as io from avalon import api +import avalon.io as io + from avalon import fusion comp = fusion.get_current_comp() diff --git a/pype/plugins/fusion/publish/render_local.py b/pype/plugins/fusion/publish/render_local.py index 681880be79..19449ead67 100644 --- a/pype/plugins/fusion/publish/render_local.py +++ b/pype/plugins/fusion/publish/render_local.py @@ -1,8 +1,8 @@ import os -from pprint import pformat +import pyblish.api import avalon.fusion as fusion -import pyblish.api +from pprint import pformat class Fusionlocal(pyblish.api.InstancePlugin): diff --git a/pype/plugins/fusion/publish/submit_deadline.py b/pype/plugins/fusion/publish/submit_deadline.py index 6f72e77455..ed3fb06586 100644 --- a/pype/plugins/fusion/publish/submit_deadline.py +++ b/pype/plugins/fusion/publish/submit_deadline.py @@ -1,11 +1,12 @@ -import getpass -import json import os +import json +import getpass -import pyblish.api from avalon import api from avalon.vendor import requests +import pyblish.api + class FusionSubmitDeadline(pyblish.api.InstancePlugin): """Submit current Comp to Deadline diff --git a/pype/plugins/global/publish/collect_avalon_entities.py b/pype/plugins/global/publish/collect_avalon_entities.py index ad8d680ae7..0b6423818e 100644 --- a/pype/plugins/global/publish/collect_avalon_entities.py +++ b/pype/plugins/global/publish/collect_avalon_entities.py @@ -8,8 +8,8 @@ Provides: context -> assetEntity - asset entity from database """ -import pyblish.api from avalon import io, api +import pyblish.api class CollectAvalonEntities(pyblish.api.ContextPlugin): diff --git a/pype/plugins/global/publish/collect_current_pype_user.py b/pype/plugins/global/publish/collect_current_pype_user.py index cfda0a4c60..a8947dd8fb 100644 --- a/pype/plugins/global/publish/collect_current_pype_user.py +++ b/pype/plugins/global/publish/collect_current_pype_user.py @@ -1,6 +1,5 @@ -import getpass import os - +import getpass import pyblish.api diff --git a/pype/plugins/global/publish/extract_burnin.py b/pype/plugins/global/publish/extract_burnin.py index 1afa84f6da..5be5060590 100644 --- a/pype/plugins/global/publish/extract_burnin.py +++ b/pype/plugins/global/publish/extract_burnin.py @@ -4,9 +4,8 @@ import json import copy import tempfile -import pyblish - import pype.api +import pyblish class ExtractBurnin(pype.api.Extractor): diff --git a/pype/plugins/global/publish/extract_hierarchy_avalon.py b/pype/plugins/global/publish/extract_hierarchy_avalon.py index 4ed931466f..74751c6807 100644 --- a/pype/plugins/global/publish/extract_hierarchy_avalon.py +++ b/pype/plugins/global/publish/extract_hierarchy_avalon.py @@ -1,8 +1,6 @@ -from copy import deepcopy - import pyblish.api from avalon import io - +from copy import deepcopy class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin): """Create entities in Avalon based on collected data.""" diff --git a/pype/plugins/global/publish/extract_jpeg.py b/pype/plugins/global/publish/extract_jpeg.py index 028277ef61..551e57796a 100644 --- a/pype/plugins/global/publish/extract_jpeg.py +++ b/pype/plugins/global/publish/extract_jpeg.py @@ -1,7 +1,6 @@ import os import pyblish.api - import pype.api import pype.lib diff --git a/pype/plugins/global/publish/extract_review.py b/pype/plugins/global/publish/extract_review.py index 79666df586..34fe6f5e10 100644 --- a/pype/plugins/global/publish/extract_review.py +++ b/pype/plugins/global/publish/extract_review.py @@ -1,11 +1,9 @@ -import copy -import json import os import re - -import clique +import copy +import json import pyblish.api - +import clique import pype.api import pype.lib diff --git a/pype/plugins/global/publish/extract_scanline_exr.py b/pype/plugins/global/publish/extract_scanline_exr.py index 88af5d9baa..ca62476ab2 100644 --- a/pype/plugins/global/publish/extract_scanline_exr.py +++ b/pype/plugins/global/publish/extract_scanline_exr.py @@ -4,7 +4,6 @@ import os import shutil import pyblish.api - import pype.api import pype.lib diff --git a/pype/plugins/global/publish/integrate_new.py b/pype/plugins/global/publish/integrate_new.py index 32e012d3ba..3e104a5498 100644 --- a/pype/plugins/global/publish/integrate_new.py +++ b/pype/plugins/global/publish/integrate_new.py @@ -1,19 +1,18 @@ -import copy -import errno -import logging import os +from os.path import getsize +import logging +import sys +import copy +import clique +import errno +import six import re import shutil -import sys -from os.path import getsize -import clique +from pymongo import DeleteOne, InsertOne import pyblish.api -import six from avalon import io from avalon.vendor import filelink -from pymongo import DeleteOne, InsertOne - import pype.api from datetime import datetime from pype.api import config @@ -680,7 +679,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): 'type': 'subset', '_id': io.ObjectId(subset["_id"]) }, {'$set': {'data.subsetGroup': - instance.data.get('subsetGroup')}} + instance.data.get('subsetGroup')}} ) # Update families on subset. @@ -857,9 +856,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin): path = rootless_path else: self.log.warning(( - "Could not find root path for remapping \"{}\"." - " This may cause issues on farm." - ).format(path)) + "Could not find root path for remapping \"{}\"." + " This may cause issues on farm." + ).format(path)) return path def get_files_info(self, instance, integrated_file_sizes): diff --git a/pype/plugins/global/publish/submit_publish_job.py b/pype/plugins/global/publish/submit_publish_job.py index 1e8c05903f..444ad28b6c 100644 --- a/pype/plugins/global/publish/submit_publish_job.py +++ b/pype/plugins/global/publish/submit_publish_job.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- """Submit publishing job to farm.""" -import json import os +import json import re from copy import copy, deepcopy import pype.api -import pyblish.api from avalon import api, io from avalon.vendor import requests, clique +import pyblish.api + def _get_script(path): diff --git a/pype/plugins/global/publish/validate_custom_ftrack_attributes.py b/pype/plugins/global/publish/validate_custom_ftrack_attributes.py index b7567c61fb..4bddcd2e03 100644 --- a/pype/plugins/global/publish/validate_custom_ftrack_attributes.py +++ b/pype/plugins/global/publish/validate_custom_ftrack_attributes.py @@ -1,5 +1,4 @@ import pyblish.api - import pype.api diff --git a/pype/plugins/harmony/load/load_background.py b/pype/plugins/harmony/load/load_background.py index 86dc96bfb3..5ef4535576 100644 --- a/pype/plugins/harmony/load/load_background.py +++ b/pype/plugins/harmony/load/load_background.py @@ -1,10 +1,10 @@ -import json import os +import json from avalon import api, harmony - import pype.lib + copy_files = """function copyFile(srcFilename, dstFilename) { var srcFile = new PermanentFile(srcFilename); diff --git a/pype/plugins/harmony/load/load_imagesequence.py b/pype/plugins/harmony/load/load_imagesequence.py index 413998bf65..b6f4845983 100644 --- a/pype/plugins/harmony/load/load_imagesequence.py +++ b/pype/plugins/harmony/load/load_imagesequence.py @@ -5,8 +5,8 @@ import uuid from pathlib import Path import clique -from avalon import api, harmony +from avalon import api, harmony import pype.lib diff --git a/pype/plugins/harmony/load/load_template_workfile.py b/pype/plugins/harmony/load/load_template_workfile.py index ddc00c82b3..1d1fd7f7be 100644 --- a/pype/plugins/harmony/load/load_template_workfile.py +++ b/pype/plugins/harmony/load/load_template_workfile.py @@ -1,7 +1,7 @@ -import os -import shutil import tempfile import zipfile +import os +import shutil from avalon import api, harmony diff --git a/pype/plugins/harmony/publish/extract_palette.py b/pype/plugins/harmony/publish/extract_palette.py index d391fc4f68..0996079dea 100644 --- a/pype/plugins/harmony/publish/extract_palette.py +++ b/pype/plugins/harmony/publish/extract_palette.py @@ -6,7 +6,6 @@ import csv from PIL import Image, ImageDraw, ImageFont from avalon import harmony - import pype.api import pype.hosts.harmony diff --git a/pype/plugins/harmony/publish/extract_render.py b/pype/plugins/harmony/publish/extract_render.py index 82353978ab..c5744d43e2 100644 --- a/pype/plugins/harmony/publish/extract_render.py +++ b/pype/plugins/harmony/publish/extract_render.py @@ -1,13 +1,13 @@ import os -import subprocess import tempfile +import subprocess -import clique import pyblish.api from avalon import harmony - import pype.lib +import clique + class ExtractRender(pyblish.api.InstancePlugin): """Produce a flattened image file from instance. diff --git a/pype/plugins/harmony/publish/extract_template.py b/pype/plugins/harmony/publish/extract_template.py index 83fdffab6b..06c4c1efcf 100644 --- a/pype/plugins/harmony/publish/extract_template.py +++ b/pype/plugins/harmony/publish/extract_template.py @@ -3,9 +3,8 @@ import os import shutil -from avalon import harmony - import pype.api +from avalon import harmony import pype.hosts.harmony diff --git a/pype/plugins/harmony/publish/extract_workfile.py b/pype/plugins/harmony/publish/extract_workfile.py index 761246c353..09bf0db860 100644 --- a/pype/plugins/harmony/publish/extract_workfile.py +++ b/pype/plugins/harmony/publish/extract_workfile.py @@ -4,9 +4,8 @@ import os import shutil from zipfile import ZipFile -from avalon import harmony - import pype.api +from avalon import harmony import pype.hosts.harmony diff --git a/pype/plugins/harmony/publish/validate_audio.py b/pype/plugins/harmony/publish/validate_audio.py index 86ae6f3125..b949b0a6e6 100644 --- a/pype/plugins/harmony/publish/validate_audio.py +++ b/pype/plugins/harmony/publish/validate_audio.py @@ -1,6 +1,7 @@ import os import pyblish.api + from avalon import harmony diff --git a/pype/plugins/harmony/publish/validate_scene_settings.py b/pype/plugins/harmony/publish/validate_scene_settings.py index a4badf8c0a..70e6f47721 100644 --- a/pype/plugins/harmony/publish/validate_scene_settings.py +++ b/pype/plugins/harmony/publish/validate_scene_settings.py @@ -4,8 +4,8 @@ import os import json import pyblish.api -from avalon import harmony +from avalon import harmony import pype.hosts.harmony diff --git a/pype/plugins/hiero/_unused/collect_timecodes.py b/pype/plugins/hiero/_unused/collect_timecodes.py index 8cbf395478..e79ee27a15 100644 --- a/pype/plugins/hiero/_unused/collect_timecodes.py +++ b/pype/plugins/hiero/_unused/collect_timecodes.py @@ -1,5 +1,5 @@ -import opentimelineio.opentime as otio_ot import pyblish.api +import opentimelineio.opentime as otio_ot class CollectClipTimecodes(pyblish.api.InstancePlugin): diff --git a/pype/plugins/hiero/_unused/collect_workfile_version.py b/pype/plugins/hiero/_unused/collect_workfile_version.py index 6f9fb1da6a..733fbfc44a 100644 --- a/pype/plugins/hiero/_unused/collect_workfile_version.py +++ b/pype/plugins/hiero/_unused/collect_workfile_version.py @@ -1,8 +1,6 @@ import pyblish.api - import pype.api as pype - class CollectWorkfileVersion(pyblish.api.ContextPlugin): """Inject the current working file version into context""" diff --git a/pype/plugins/hiero/_unused/extract_plates_waiting.py b/pype/plugins/hiero/_unused/extract_plates_waiting.py index dccb4cdd9b..f385f74a3e 100644 --- a/pype/plugins/hiero/_unused/extract_plates_waiting.py +++ b/pype/plugins/hiero/_unused/extract_plates_waiting.py @@ -1,8 +1,7 @@ +from pyblish import api import os import time -from pyblish import api - class ExtractPlateCheck(api.ContextPlugin): """Collect all Track items selection.""" diff --git a/pype/plugins/hiero/_unused/validate_viewer_lut.py b/pype/plugins/hiero/_unused/validate_viewer_lut.py index 8a1ebf6817..4d307b5a71 100644 --- a/pype/plugins/hiero/_unused/validate_viewer_lut.py +++ b/pype/plugins/hiero/_unused/validate_viewer_lut.py @@ -10,6 +10,9 @@ class ValidateViewerLut(api.ContextPlugin): optional = True def process(self, context): + import nuke + import hiero + # nuke_lut = nuke.ViewerProcess.node()["current"].value() hiero_lut = context.data["activeProject"].lutSettingViewer() self.log.info("__ hiero_lut: {}".format(hiero_lut)) diff --git a/pype/plugins/hiero/load/load_sequences_to_timeline_asset_origin.py b/pype/plugins/hiero/load/load_sequences_to_timeline_asset_origin.py index 280eaed460..3c58a0a90d 100644 --- a/pype/plugins/hiero/load/load_sequences_to_timeline_asset_origin.py +++ b/pype/plugins/hiero/load/load_sequences_to_timeline_asset_origin.py @@ -1,8 +1,6 @@ -import hiero from avalon import api - +import hiero from pype.hosts.hiero import lib - reload(lib) diff --git a/pype/plugins/hiero/publish/collect_assetbuilds.py b/pype/plugins/hiero/publish/collect_assetbuilds.py index 4b822808ad..f20acaf3da 100644 --- a/pype/plugins/hiero/publish/collect_assetbuilds.py +++ b/pype/plugins/hiero/publish/collect_assetbuilds.py @@ -1,5 +1,5 @@ -from avalon import io from pyblish import api +from avalon import io class CollectAssetBuilds(api.ContextPlugin): diff --git a/pype/plugins/hiero/publish/collect_audio.py b/pype/plugins/hiero/publish/collect_audio.py index 9f64ac60af..a63a18be05 100644 --- a/pype/plugins/hiero/publish/collect_audio.py +++ b/pype/plugins/hiero/publish/collect_audio.py @@ -1,7 +1,5 @@ -import os - from pyblish import api - +import os class CollectAudio(api.InstancePlugin): """Collect audio from tags. diff --git a/pype/plugins/hiero/publish/collect_calculate_retime.py b/pype/plugins/hiero/publish/collect_calculate_retime.py index b6697b2a6a..1b2f047da2 100644 --- a/pype/plugins/hiero/publish/collect_calculate_retime.py +++ b/pype/plugins/hiero/publish/collect_calculate_retime.py @@ -1,7 +1,6 @@ -import math - -import hiero from pyblish import api +import hiero +import math class CollectCalculateRetime(api.InstancePlugin): diff --git a/pype/plugins/hiero/publish/collect_clips.py b/pype/plugins/hiero/publish/collect_clips.py index 2aa3629837..724e4730ed 100644 --- a/pype/plugins/hiero/publish/collect_clips.py +++ b/pype/plugins/hiero/publish/collect_clips.py @@ -1,7 +1,8 @@ +import os + +from pyblish import api import hiero import nuke -from pyblish import api - class CollectClips(api.ContextPlugin): """Collect all Track items selection.""" diff --git a/pype/plugins/hiero/publish/collect_colorspace.py b/pype/plugins/hiero/publish/collect_colorspace.py index 1480db5c70..2b629ba1f7 100644 --- a/pype/plugins/hiero/publish/collect_colorspace.py +++ b/pype/plugins/hiero/publish/collect_colorspace.py @@ -7,6 +7,8 @@ class CollectProjectColorspace(pyblish.api.ContextPlugin): order = pyblish.api.CollectorOrder + 0.1 label = "Project's color settings" def process(self, context): + import hiero + project = context.data["activeProject"] colorspace = {} colorspace["useOCIOEnvironmentOverride"] = project.useOCIOEnvironmentOverride() diff --git a/pype/plugins/hiero/publish/collect_effects.py b/pype/plugins/hiero/publish/collect_effects.py index 7ca3566d27..55ff849c88 100644 --- a/pype/plugins/hiero/publish/collect_effects.py +++ b/pype/plugins/hiero/publish/collect_effects.py @@ -1,6 +1,5 @@ -import re - import pyblish.api +import re class CollectVideoTracksLuts(pyblish.api.InstancePlugin): diff --git a/pype/plugins/hiero/publish/collect_hierarchy_context.py b/pype/plugins/hiero/publish/collect_hierarchy_context.py index d68e44e730..77b10dc9e4 100644 --- a/pype/plugins/hiero/publish/collect_hierarchy_context.py +++ b/pype/plugins/hiero/publish/collect_hierarchy_context.py @@ -1,7 +1,6 @@ -import re - -import avalon.api as avalon import pyblish.api +import avalon.api as avalon +import re class CollectHierarchyInstance(pyblish.api.ContextPlugin): diff --git a/pype/plugins/hiero/publish/collect_review.py b/pype/plugins/hiero/publish/collect_review.py index ee846a4fdc..f1767b2a68 100644 --- a/pype/plugins/hiero/publish/collect_review.py +++ b/pype/plugins/hiero/publish/collect_review.py @@ -1,9 +1,8 @@ +from pyblish import api import os import re import clique -from pyblish import api - class CollectReview(api.InstancePlugin): """Collect review from tags. diff --git a/pype/plugins/hiero/publish/collect_selection.py b/pype/plugins/hiero/publish/collect_selection.py index bd1acfc1ad..28a529d560 100644 --- a/pype/plugins/hiero/publish/collect_selection.py +++ b/pype/plugins/hiero/publish/collect_selection.py @@ -1,6 +1,7 @@ -import hiero import pyblish.api +import hiero + class CollectSelection(pyblish.api.ContextPlugin): """Inject the selection in the context.""" diff --git a/pype/plugins/hiero/publish/collect_sequence.py b/pype/plugins/hiero/publish/collect_sequence.py index 7b96037194..4247c7c4cb 100644 --- a/pype/plugins/hiero/publish/collect_sequence.py +++ b/pype/plugins/hiero/publish/collect_sequence.py @@ -1,5 +1,5 @@ -import hiero from pyblish import api +import hiero class CollectSequence(api.ContextPlugin): diff --git a/pype/plugins/hiero/publish/collect_tag_framestart.py b/pype/plugins/hiero/publish/collect_tag_framestart.py index 597e62846b..0d14271aa5 100644 --- a/pype/plugins/hiero/publish/collect_tag_framestart.py +++ b/pype/plugins/hiero/publish/collect_tag_framestart.py @@ -1,5 +1,5 @@ from pyblish import api - +import os class CollectClipTagFrameStart(api.InstancePlugin): """Collect FrameStart from Tags of selected track items.""" diff --git a/pype/plugins/hiero/publish/collect_tag_handles.py b/pype/plugins/hiero/publish/collect_tag_handles.py index b5179d3d40..7e51efd8e1 100644 --- a/pype/plugins/hiero/publish/collect_tag_handles.py +++ b/pype/plugins/hiero/publish/collect_tag_handles.py @@ -1,5 +1,4 @@ import json - from pyblish import api diff --git a/pype/plugins/hiero/publish/extract_audio.py b/pype/plugins/hiero/publish/extract_audio.py index 6f1bdf37fb..34fdcdfe9d 100644 --- a/pype/plugins/hiero/publish/extract_audio.py +++ b/pype/plugins/hiero/publish/extract_audio.py @@ -1,5 +1,4 @@ from pyblish import api - import pype diff --git a/pype/plugins/hiero/publish/extract_effects.py b/pype/plugins/hiero/publish/extract_effects.py index e829c08210..5c9ee97f2b 100644 --- a/pype/plugins/hiero/publish/extract_effects.py +++ b/pype/plugins/hiero/publish/extract_effects.py @@ -1,11 +1,10 @@ # from pype import plugins -import copy -import json import os +import json import re -import tempfile - +import copy import pyblish.api +import tempfile from avalon import io, api diff --git a/pype/plugins/hiero/publish/version_up_workfile.py b/pype/plugins/hiero/publish/version_up_workfile.py index a436111e3d..893d3789eb 100644 --- a/pype/plugins/hiero/publish/version_up_workfile.py +++ b/pype/plugins/hiero/publish/version_up_workfile.py @@ -1,5 +1,4 @@ from pyblish import api - import pype.api as pype diff --git a/pype/plugins/maya/create/create_render.py b/pype/plugins/maya/create/create_render.py index cc0e23003e..fa0e269126 100644 --- a/pype/plugins/maya/create/create_render.py +++ b/pype/plugins/maya/create/create_render.py @@ -1,15 +1,15 @@ # -*- coding: utf-8 -*- """Create ``Render`` instance in Maya.""" -import json import os - +import json import appdirs -import avalon.maya -import maya.app.renderSetup.model.renderSetup as renderSetup import requests + from maya import cmds +import maya.app.renderSetup.model.renderSetup as renderSetup from pype.hosts.maya import lib +import avalon.maya class CreateRender(avalon.maya.Creator): diff --git a/pype/plugins/maya/load/load_look.py b/pype/plugins/maya/load/load_look.py index c9d964ec53..c5b58c9bd5 100644 --- a/pype/plugins/maya/load/load_look.py +++ b/pype/plugins/maya/load/load_look.py @@ -1,12 +1,10 @@ -import json -from collections import defaultdict - -from Qt import QtWidgets -from avalon import api, io - -import pype.hosts.maya.lib import pype.hosts.maya.plugin +from avalon import api, io +import json +import pype.hosts.maya.lib +from collections import defaultdict from pype.widgets.message_window import ScrollMessageBox +from Qt import QtWidgets class LookLoader(pype.hosts.maya.plugin.ReferenceLoader): diff --git a/pype/plugins/maya/publish/collect_render.py b/pype/plugins/maya/publish/collect_render.py index 7f898c4edd..3dde3b1592 100644 --- a/pype/plugins/maya/publish/collect_render.py +++ b/pype/plugins/maya/publish/collect_render.py @@ -39,17 +39,18 @@ Provides: instance -> pixelAspect """ -import json -import os import re +import os +import json -import maya.app.renderSetup.model.renderSetup as renderSetup -import pyblish.api -from avalon import maya, api from maya import cmds +import maya.app.renderSetup.model.renderSetup as renderSetup -from pype.hosts.maya import lib +import pyblish.api + +from avalon import maya, api from pype.hosts.maya.expected_files import ExpectedFiles +from pype.hosts.maya import lib class CollectMayaRender(pyblish.api.ContextPlugin): diff --git a/pype/plugins/maya/publish/collect_yeti_cache.py b/pype/plugins/maya/publish/collect_yeti_cache.py index 594c26a166..26c3f601f6 100644 --- a/pype/plugins/maya/publish/collect_yeti_cache.py +++ b/pype/plugins/maya/publish/collect_yeti_cache.py @@ -1,6 +1,7 @@ -import pyblish.api from maya import cmds +import pyblish.api + from pype.hosts.maya import lib SETTINGS = {"renderDensity", diff --git a/pype/plugins/maya/publish/submit_maya_deadline.py b/pype/plugins/maya/publish/submit_maya_deadline.py index e52cc0bc49..0ae19cbb81 100644 --- a/pype/plugins/maya/publish/submit_maya_deadline.py +++ b/pype/plugins/maya/publish/submit_maya_deadline.py @@ -17,23 +17,24 @@ Attributes: """ from __future__ import print_function - -import copy -import getpass -import hashlib -import itertools -import json import os +import json +import getpass +import copy import re -from collections import OrderedDict +import hashlib from datetime import datetime +import itertools +from collections import OrderedDict import clique -import pyblish.api import requests -from avalon import api + from maya import cmds +from avalon import api +import pyblish.api + from pype.hosts.maya import lib # Documentation for keys available at: diff --git a/pype/plugins/nuke/create/create_camera.py b/pype/plugins/nuke/create/create_camera.py index c29c785462..4c668925ad 100644 --- a/pype/plugins/nuke/create/create_camera.py +++ b/pype/plugins/nuke/create/create_camera.py @@ -1,6 +1,6 @@ import avalon.nuke -import nuke from avalon.nuke import lib as anlib +import nuke class CreateCamera(avalon.nuke.Creator): diff --git a/pype/plugins/nuke/load/load_backdrop.py b/pype/plugins/nuke/load/load_backdrop.py index 7b0685b57d..7d18893965 100644 --- a/pype/plugins/nuke/load/load_backdrop.py +++ b/pype/plugins/nuke/load/load_backdrop.py @@ -1,11 +1,9 @@ +from avalon import api, style, io import nuke import nukescripts -from avalon import api, style, io -from avalon.nuke import containerise, update_container -from avalon.nuke import lib as anlib - from pype.hosts.nuke import lib as pnlib - +from avalon.nuke import lib as anlib +from avalon.nuke import containerise, update_container reload(pnlib) class LoadBackdropNodes(api.Loader): diff --git a/pype/plugins/nuke/load/load_camera_abc.py b/pype/plugins/nuke/load/load_camera_abc.py index f10c3c4fba..377d60e84b 100644 --- a/pype/plugins/nuke/load/load_camera_abc.py +++ b/pype/plugins/nuke/load/load_camera_abc.py @@ -1,7 +1,7 @@ -import nuke from avalon import api, io -from avalon.nuke import containerise, update_container from avalon.nuke import lib as anlib +from avalon.nuke import containerise, update_container +import nuke class AlembicCameraLoader(api.Loader): diff --git a/pype/plugins/nuke/publish/extract_camera.py b/pype/plugins/nuke/publish/extract_camera.py index 7dc5a70032..9a1efba1df 100644 --- a/pype/plugins/nuke/publish/extract_camera.py +++ b/pype/plugins/nuke/publish/extract_camera.py @@ -1,12 +1,10 @@ -import math -import os -from pprint import pformat - import nuke +import os +import math import pyblish.api -from avalon.nuke import lib as anlib - import pype.api +from avalon.nuke import lib as anlib +from pprint import pformat class ExtractCamera(pype.api.Extractor): diff --git a/pype/plugins/standalonepublisher/publish/collect_instance_data.py b/pype/plugins/standalonepublisher/publish/collect_instance_data.py index bc4eeb89d1..fc0cfa4194 100644 --- a/pype/plugins/standalonepublisher/publish/collect_instance_data.py +++ b/pype/plugins/standalonepublisher/publish/collect_instance_data.py @@ -22,7 +22,7 @@ class CollectInstanceData(pyblish.api.InstancePlugin): hosts = ["standalonepublisher"] def process(self, instance): - fps = instance.data["assetEntity"]["data"]["fps"] + fps = instance.context.data["fps"] instance.data.update({ "fps": fps })