revert messed imports 2

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")
 
 

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__)
 
 

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")
 

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:

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()

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):

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

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):

pype/plugins/global/publish/collect_current_pype_user.py

@@ -1,6 +1,5 @@
-import getpass
 import os
-
+import getpass
 import pyblish.api
 
 

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):

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."""

pype/plugins/global/publish/extract_jpeg.py

@@ -1,7 +1,6 @@
 import os
 
 import pyblish.api
-
 import pype.api
 import pype.lib
 

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
 

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
 

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):

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):
 

pype/plugins/global/publish/validate_custom_ftrack_attributes.py

@@ -1,5 +1,4 @@
 import pyblish.api
-
 import pype.api
 
 

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);

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
 
 

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
 

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
 

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.

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
 
 

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
 
 

pype/plugins/harmony/publish/validate_audio.py

@@ -1,6 +1,7 @@
 import os
 
 import pyblish.api
+
 from avalon import harmony
 
 

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
 
 

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):

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"""
 

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."""

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))

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)
 
 

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):

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.

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):

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."""

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()

pype/plugins/hiero/publish/collect_effects.py

@@ -1,6 +1,5 @@
-import re
-
 import pyblish.api
+import re
 
 
 class CollectVideoTracksLuts(pyblish.api.InstancePlugin):

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):

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.

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."""

pype/plugins/hiero/publish/collect_sequence.py

@@ -1,5 +1,5 @@
-import hiero
 from pyblish import api
+import hiero
 
 
 class CollectSequence(api.ContextPlugin):

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."""

pype/plugins/hiero/publish/collect_tag_handles.py

@@ -1,5 +1,4 @@
 import json
-
 from pyblish import api
 
 

pype/plugins/hiero/publish/extract_audio.py

@@ -1,5 +1,4 @@
 from pyblish import api
-
 import pype
 
 

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
 
 

pype/plugins/hiero/publish/version_up_workfile.py

@@ -1,5 +1,4 @@
 from pyblish import api
-
 import pype.api as pype
 
 

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):

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):

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):

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",

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:

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):

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):

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):

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):

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
         })