revert messed imports 1

pype/hooks/fusion/prelaunch.py

@@ -1,11 +1,9 @@
-import importlib
 import os
 import traceback
-
-from pypeapp import Logger
-
-from pype.hosts.fusion import utils
+import importlib
 from pype.lib import PypeHook
+from pypeapp import Logger
+from pype.hosts.fusion import utils
 
 
 class FusionPrelaunch(PypeHook):

pype/hosts/fusion/__init__.py

@@ -1,18 +1,23 @@
-from .lib import (
-    get_additional_data,
-    update_frame_range
-)
-from .menu import launch_pype_menu
 from .pipeline import (
     install,
     uninstall,
     publish,
     launch_workfiles_app
 )
+
 from .utils import (
     setup
 )
 
+
+from .lib import (
+    get_additional_data,
+    update_frame_range
+)
+
+from .menu import launch_pype_menu
+
+
 __all__ = [
     # pipeline
     "install",

pype/hosts/fusion/menu.py

@@ -2,6 +2,12 @@ import os
 import sys
 
 from Qt import QtWidgets, QtCore
+
+from .pipeline import (
+    publish,
+    launch_workfiles_app
+)
+
 from avalon.tools import (
     creator,
     loader,
@@ -9,10 +15,6 @@ from avalon.tools import (
     libraryloader
 )
 
-from .pipeline import (
-    publish,
-    launch_workfiles_app
-)
 from .scripts import (
     set_rendermode,
     duplicate_with_inputs

pype/hosts/fusion/pipeline.py

@@ -3,11 +3,10 @@ Basic avalon integration
 """
 import os
 
-from avalon import api as avalon
 from avalon.tools import workfiles
+from avalon import api as avalon
 from pyblish import api as pyblish
 from pypeapp import Logger
-
 from pype import PLUGINS_DIR
 
 log = Logger().get_logger(__name__, "fusion")

pype/hosts/fusion/scripts/fusion_switch_shot.py

@@ -1,15 +1,15 @@
-import logging
 import os
 import re
 import sys
+import logging
 
-import avalon.fusion
 # Pipeline imports
 from avalon import api, io, pipeline
+import avalon.fusion
 
-import pype.hosts.fusion.lib as fusion_lib
 # Config imports
 import pype.lib as pype
+import pype.hosts.fusion.lib as fusion_lib
 
 log = logging.getLogger("Update Slap Comp")
 

pype/hosts/fusion/scripts/set_rendermode.py

@@ -1,6 +1,7 @@
-import avalon.fusion as avalon
-from avalon.vendor import qtawesome
 from avalon.vendor.Qt import QtWidgets
+from avalon.vendor import qtawesome
+import avalon.fusion as avalon
+
 
 _help = {"local": "Render the comp on your own machine and publish "
                   "it from that the destination folder",

pype/hosts/fusion/utility_scripts/32bit/backgrounds_selected_to32bit.py

@@ -1,6 +1,6 @@
-from avalon import fusion
 from avalon.fusion import comp_lock_and_undo_chunk
 
+from avalon import fusion
 comp = fusion.get_current_comp()
 
 

pype/hosts/fusion/utility_scripts/32bit/backgrounds_to32bit.py

@@ -1,6 +1,5 @@
-from avalon import fusion
 from avalon.fusion import comp_lock_and_undo_chunk
-
+from avalon import fusion
 comp = fusion.get_current_comp()
 
 

pype/hosts/fusion/utility_scripts/32bit/loaders_selected_to32bit.py

@@ -1,6 +1,5 @@
-from avalon import fusion
 from avalon.fusion import comp_lock_and_undo_chunk
-
+from avalon import fusion
 comp = fusion.get_current_comp()
 
 

pype/hosts/fusion/utility_scripts/32bit/loaders_to32bit.py

@@ -1,6 +1,5 @@
-from avalon import fusion
 from avalon.fusion import comp_lock_and_undo_chunk
-
+from avalon import fusion
 comp = fusion.get_current_comp()
 
 

pype/hosts/fusion/utility_scripts/Pype_menu.py

@@ -1,10 +1,9 @@
 import os
 import sys
+import pype
 
 from pypeapp import Logger
 
-import pype
-
 log = Logger().get_logger(__name__)
 
 

pype/hosts/fusion/utility_scripts/switch_ui.py

@@ -1,14 +1,15 @@
+import os
 import glob
 import logging
-import os
 
-import avalon.api as api
-import avalon.fusion
 import avalon.io as io
+import avalon.api as api
 import avalon.pipeline as pipeline
+import avalon.fusion
 import avalon.style as style
-from avalon.vendor import qtawesome as qta
 from avalon.vendor.Qt import QtWidgets, QtCore
+from avalon.vendor import qtawesome as qta
+
 
 log = logging.getLogger("Fusion Switch Shot")
 

pype/hosts/hiero/__init__.py

@@ -1,15 +1,9 @@
 import os
-
+from pype.api import Logger
 from avalon import api as avalon
 from pyblish import api as pyblish
-
 from pype import PLUGINS_DIR
-from pype.api import Logger
-from .events import register_hiero_events
-from .menu import (
-    install as menu_install,
-    _update_menu_task_label
-)
+
 from .workio import (
     open_file,
     save_file,
@@ -19,6 +13,13 @@ from .workio import (
     work_root
 )
 
+from .menu import (
+    install as menu_install,
+    _update_menu_task_label
+)
+
+from .events import register_hiero_events
+
 __all__ = [
     # Workfiles API
     "open_file",

pype/hosts/hiero/events.py

@@ -1,7 +1,5 @@
 import os
-
 import hiero.core.events
-
 from pype.api import Logger
 from .lib import sync_avalon_data_to_workfile, launch_workfiles_app
 from .tags import add_tags_from_presets

pype/hosts/hiero/lib.py

@@ -1,13 +1,11 @@
 import os
 import re
 import sys
-
-import avalon.api as avalon
 import hiero
 import pyblish.api
+import avalon.api as avalon
 import avalon.io
 from avalon.vendor.Qt import (QtWidgets, QtGui)
-
 import pype.api as pype
 from pype.api import Logger, Anatomy
 
@@ -94,6 +92,7 @@ def launch_workfiles_app(event):
     set_workfiles()
 
 
+
 def reload_config():
     """Attempt to reload pipeline at run-time.
 
@@ -334,9 +333,10 @@ def CreateNukeWorkfile(nodes=None,
 
     '''
     import hiero.core
+    from avalon.nuke import imprint
     from pype.hosts.nuke import (
         lib as nklib
-    )
+        )
 
     # check if the file exists if does then Raise "File exists!"
     if os.path.exists(filepath):
@@ -398,7 +398,7 @@ class ClipLoader:
         self.data = dict()
 
         assert self._set_data(), str("Cannot Load selected data, look into "
-                                     "database or call your supervisor")
+                                    "database or call your supervisor")
 
         # inject asset data to representation dict
         self._get_asset_data()
@@ -444,12 +444,12 @@ class ClipLoader:
             "Loader",
             repr_cntx["hierarchy"].replace("\\", "/"),
             asset
-        )))
+            )))
 
         self.data["binPath"] = self.kwargs.get(
             "projectBinPath",
             hierarchy
-        )
+            )
 
         return True
 
@@ -460,7 +460,7 @@ class ClipLoader:
         if "#" not in file:
             frame = self.context["representation"]["context"].get("frame")
             padding = len(frame)
-            file = file.replace(frame, "#" * padding)
+            file = file.replace(frame, "#"*padding)
         self.data["path"] = file
 
     def _get_active_project(self):
@@ -604,8 +604,8 @@ class ClipLoader:
             (f for f in self.context["version"]["data"]["families"]
              if "slate" in f),
             None) or bool(((
-                clip_out - clip_in + 1) + handle_start + handle_end
-            ) - media_duration)
+                    clip_out - clip_in + 1) + handle_start + handle_end
+                    ) - media_duration)
 
         log.debug("__ slate_on: `{}`".format(slate_on))
 

pype/hosts/hiero/menu.py

@@ -1,16 +1,16 @@
 import os
 import sys
-
 import hiero.core
+from pype.api import Logger
 from avalon.api import Session
 from hiero.ui import findMenuAction
 
-from pype.api import Logger
+from .tags import add_tags_from_presets
+
 from .lib import (
     reload_config,
     set_workfiles
 )
-from .tags import add_tags_from_presets
 
 log = Logger().get_logger(__name__, "hiero")
 

pype/hosts/hiero/tags.py

@@ -1,12 +1,12 @@
-import json
-import os
 import re
+import os
+import json
+import hiero
+
 from pprint import pformat
 
-import hiero
-from avalon import io
-
 from pype.api import Logger
+from avalon import io
 
 log = Logger().get_logger(__name__, "hiero")
 

pype/hosts/hiero/workio.py

@@ -1,10 +1,9 @@
 import os
-
 import hiero
 from avalon import api
-
 from pype.api import Logger
 
+
 log = Logger().get_logger(__name__, "hiero")
 
 

pype/hosts/maya/menu.py

@@ -1,12 +1,11 @@
-import logging
-import os
 import sys
+import os
+import logging
 
-import maya.cmds as cmds
-from avalon.maya import pipeline
 from avalon.vendor.Qt import QtWidgets, QtGui
-
+from avalon.maya import pipeline
 from ...lib import BuildWorkfile
+import maya.cmds as cmds
 
 self = sys.modules[__name__]
 self._menu = os.environ['PYPE_STUDIO_NAME']

pype/lib/log.py

@@ -386,6 +386,7 @@ def timeit(method):
         For debugging.
         Depends on presence of 'log' object
     """
+    log = logging.getLogger()
     def timed(*args, **kw):
         ts = time.time()
         result = method(*args, **kw)

pype/tools/launcher/actions.py

@@ -103,5 +103,6 @@ def register_environment_actions():
                     )
                 )
 
+
 class ApplicationLaunchFailed(Exception):
-    pass
+    pass

pype/tools/tray/pype_tray.py

@@ -212,7 +212,6 @@ class TrayManager:
                             "Module \"{}\" does not have attribute \"{}\"."
                             " Check your settings please."
                         ).format(import_path, key))
-            p = os.environ["AVALON_SCHEMA"]
             obj = module.tray_init(self.tray_widget, self.main_window)
             name = obj.__class__.__name__
             if hasattr(obj, 'tray_menu'):