Merge pull request #1373 from pypeclub/feature/maya_python_3

openpype/hosts/maya/api/lib.py

@@ -437,7 +437,8 @@ def empty_sets(sets, force=False):
             cmds.connectAttr(src, dest)
 
         # Restore original members
-        for origin_set, members in original.iteritems():
+        _iteritems = getattr(original, "iteritems", original.items)
+        for origin_set, members in _iteritems():
             cmds.sets(members, forceElement=origin_set)
 
 
@@ -581,7 +582,7 @@ def get_shader_assignments_from_shapes(shapes, components=True):
 
         # Build a mapping from parent to shapes to include in lookup.
         transforms = {shape.rsplit("|", 1)[0]: shape for shape in shapes}
-        lookup = set(shapes + transforms.keys())
+        lookup = set(shapes) | set(transforms.keys())
 
         component_assignments = defaultdict(list)
         for shading_group in assignments.keys():
@@ -669,7 +670,8 @@ def displaySmoothness(nodes,
         yield
     finally:
         # Revert state
-        for node, state in originals.iteritems():
+        _iteritems = getattr(originals, "iteritems", originals.items)
+        for node, state in _iteritems():
             if state:
                 cmds.displaySmoothness(node, **state)
 
@@ -712,7 +714,8 @@ def no_display_layers(nodes):
         yield
     finally:
         # Restore original members
-        for layer, members in original.iteritems():
+        _iteritems = getattr(original, "iteritems", original.items)
+        for layer, members in _iteritems():
             cmds.editDisplayLayerMembers(layer, members, noRecurse=True)
 
 

openpype/hosts/maya/api/setdress.py

@@ -5,6 +5,7 @@ import os
 import contextlib
 import copy
 
+import six
 from maya import cmds
 
 from avalon import api, io
@@ -69,7 +70,8 @@ def unlocked(nodes):
         yield
     finally:
         # Reapply original states
-        for uuid, state in states.iteritems():
+        _iteritems = getattr(states, "iteritems", states.items)
+        for uuid, state in _iteritems():
             nodes_from_id = cmds.ls(uuid, long=True)
             if nodes_from_id:
                 node = nodes_from_id[0]
@@ -94,7 +96,7 @@ def load_package(filepath, name, namespace=None):
         # Define a unique namespace for the package
         namespace = os.path.basename(filepath).split(".")[0]
         unique_namespace(namespace)
-    assert isinstance(namespace, basestring)
+    assert isinstance(namespace, six.string_types)
 
     # Load the setdress package data
     with open(filepath, "r") as fp:

openpype/hosts/maya/plugins/publish/extract_fbx.py

@@ -183,7 +183,8 @@ class ExtractFBX(openpype.api.Extractor):
         # Apply the FBX overrides through MEL since the commands
         # only work correctly in MEL according to online
         # available discussions on the topic
-        for option, value in options.iteritems():
+        _iteritems = getattr(options, "iteritems", options.items)
+        for option, value in _iteritems():
             key = option[0].upper() + option[1:]  # uppercase first letter
 
             # Boolean must be passed as lower-case strings

openpype/hosts/maya/plugins/publish/submit_maya_muster.py

@@ -383,7 +383,7 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin):
                     "attributes": {
                         "environmental_variables": {
                             "value": ", ".join("{!s}={!r}".format(k, v)
-                                               for (k, v) in env.iteritems()),
+                                               for (k, v) in env.items()),
 
                             "state": True,
                             "subst": False

openpype/hosts/maya/plugins/publish/validate_instance_subset.py

@@ -2,6 +2,8 @@ import pyblish.api
 import openpype.api
 import string
 
+import six
+
 # Allow only characters, numbers and underscore
 allowed = set(string.ascii_lowercase +
               string.ascii_uppercase +
@@ -29,7 +31,7 @@ class ValidateSubsetName(pyblish.api.InstancePlugin):
             raise RuntimeError("Instance is missing subset "
                                "name: {0}".format(subset))
 
-        if not isinstance(subset, basestring):
+        if not isinstance(subset, six.string_types):
             raise TypeError("Instance subset name must be string, "
                             "got: {0} ({1})".format(subset, type(subset)))
 

openpype/hosts/maya/plugins/publish/validate_node_ids_unique.py

@@ -52,7 +52,8 @@ class ValidateNodeIdsUnique(pyblish.api.InstancePlugin):
 
         # Take only the ids with more than one member
         invalid = list()
-        for _ids, members in ids.iteritems():
+        _iteritems = getattr(ids, "iteritems", ids.items)
+        for _ids, members in _iteritems():
             if len(members) > 1:
                 cls.log.error("ID found on multiple nodes: '%s'" % members)
                 invalid.extend(members)

openpype/hosts/maya/plugins/publish/validate_node_no_ghosting.py

@@ -32,7 +32,10 @@ class ValidateNodeNoGhosting(pyblish.api.InstancePlugin):
         nodes = cmds.ls(instance, long=True, type=['transform', 'shape'])
         invalid = []
         for node in nodes:
-            for attr, required_value in cls._attributes.iteritems():
+            _iteritems = getattr(
+                cls._attributes, "iteritems", cls._attributes.items
+            )
+            for attr, required_value in _iteritems():
                 if cmds.attributeQuery(attr, node=node, exists=True):
 
                     value = cmds.getAttr('{0}.{1}'.format(node, attr))

openpype/hosts/maya/plugins/publish/validate_shape_render_stats.py

@@ -33,7 +33,8 @@ class ValidateShapeRenderStats(pyblish.api.Validator):
         shapes = cmds.ls(instance, long=True, type='surfaceShape')
         invalid = []
         for shape in shapes:
-            for attr, default_value in cls.defaults.iteritems():
+            _iteritems = getattr(cls.defaults, "iteritems", cls.defaults.items)
+            for attr, default_value in _iteritems():
                 if cmds.attributeQuery(attr, node=shape, exists=True):
                     value = cmds.getAttr('{}.{}'.format(shape, attr))
                     if value != default_value:
@@ -52,7 +53,8 @@ class ValidateShapeRenderStats(pyblish.api.Validator):
     @classmethod
     def repair(cls, instance):
         for shape in cls.get_invalid(instance):
-            for attr, default_value in cls.defaults.iteritems():
+            _iteritems = getattr(cls.defaults, "iteritems", cls.defaults.items)
+            for attr, default_value in _iteritems():
 
                 if cmds.attributeQuery(attr, node=shape, exists=True):
                     plug = '{0}.{1}'.format(shape, attr)

openpype/tools/mayalookassigner/app.py

@@ -2,20 +2,27 @@ import sys
 import time
 import logging
 
+from Qt import QtWidgets, QtCore
+
 from openpype.hosts.maya.api.lib import assign_look_by_version
 
 from avalon import style, io
 from avalon.tools import lib
-from avalon.vendor.Qt import QtWidgets, QtCore
 
 from maya import cmds
 # old api for MFileIO
 import maya.OpenMaya
 import maya.api.OpenMaya as om
 
-from . import widgets
-from . import commands
-from . vray_proxies import vrayproxy_assign_look
+from .widgets import (
+    AssetOutliner,
+    LookOutliner
+)
+from .commands import (
+    get_workfile,
+    remove_unused_looks
+)
+from .vray_proxies import vrayproxy_assign_look
 
 
 module = sys.modules[__name__]
@@ -32,7 +39,7 @@ class App(QtWidgets.QWidget):
         # Store callback references
         self._callbacks = []
 
-        filename = commands.get_workfile()
+        filename = get_workfile()
 
         self.setObjectName("lookManager")
         self.setWindowTitle("Look Manager 1.3.0 - [{}]".format(filename))
@@ -57,13 +64,13 @@ class App(QtWidgets.QWidget):
         """Build the UI"""
 
         # Assets (left)
-        asset_outliner = widgets.AssetOutliner()
+        asset_outliner = AssetOutliner()
 
         # Looks (right)
         looks_widget = QtWidgets.QWidget()
         looks_layout = QtWidgets.QVBoxLayout(looks_widget)
 
-        look_outliner = widgets.LookOutliner()  # Database look overview
+        look_outliner = LookOutliner()  # Database look overview
 
         assign_selected = QtWidgets.QCheckBox("Assign to selected only")
         assign_selected.setToolTip("Whether to assign only to selected nodes "
@@ -124,7 +131,7 @@ class App(QtWidgets.QWidget):
             lambda: self.echo("Loaded assets.."))
 
         self.look_outliner.menu_apply_action.connect(self.on_process_selected)
-        self.remove_unused.clicked.connect(commands.remove_unused_looks)
+        self.remove_unused.clicked.connect(remove_unused_looks)
 
         # Maya renderlayer switch callback
         callback = om.MEventMessage.addEventCallback(

openpype/tools/mayalookassigner/commands.py

@@ -9,7 +9,7 @@ from openpype.hosts.maya.api import lib
 from avalon import io, api
 
 
-import vray_proxies
+from .vray_proxies import get_alembic_ids_cache
 
 log = logging.getLogger(__name__)
 
@@ -146,7 +146,7 @@ def create_items_from_nodes(nodes):
         vray_proxy_nodes = cmds.ls(nodes, type="VRayProxy")
         for vp in vray_proxy_nodes:
             path = cmds.getAttr("{}.fileName".format(vp))
-            ids = vray_proxies.get_alembic_ids_cache(path)
+            ids = get_alembic_ids_cache(path)
             parent_id = {}
             for k, _ in ids.items():
                 pid = k.split(":")[0]

openpype/tools/mayalookassigner/models.py

@@ -1,7 +1,8 @@
 from collections import defaultdict
-from avalon.tools import models
 
-from avalon.vendor.Qt import QtCore
+from Qt import QtCore
+
+from avalon.tools import models
 from avalon.vendor import qtawesome
 from avalon.style import colors
 

openpype/tools/mayalookassigner/views.py

@@ -1,4 +1,4 @@
-from avalon.vendor.Qt import QtWidgets, QtCore
+from Qt import QtWidgets, QtCore
 
 
 DEFAULT_COLOR = "#fb9c15"

openpype/tools/mayalookassigner/widgets.py

@@ -1,13 +1,16 @@
 import logging
 from collections import defaultdict
 
-from avalon.vendor.Qt import QtWidgets, QtCore
+from Qt import QtWidgets, QtCore
 
 # TODO: expose this better in avalon core
 from avalon.tools import lib
 from avalon.tools.models import TreeModel
 
-from . import models
+from .models import (
+    AssetModel,
+    LookModel
+)
 from . import commands
 from . import views
 
@@ -30,7 +33,7 @@ class AssetOutliner(QtWidgets.QWidget):
         title.setAlignment(QtCore.Qt.AlignCenter)
         title.setStyleSheet("font-weight: bold; font-size: 12px")
 
-        model = models.AssetModel()
+        model = AssetModel()
         view = views.View()
         view.setModel(model)
         view.customContextMenuRequested.connect(self.right_mouse_menu)
@@ -201,7 +204,7 @@ class LookOutliner(QtWidgets.QWidget):
         title.setStyleSheet("font-weight: bold; font-size: 12px")
         title.setAlignment(QtCore.Qt.AlignCenter)
 
-        model = models.LookModel()
+        model = LookModel()
 
         # Proxy for dynamic sorting
         proxy = QtCore.QSortFilterProxyModel()
@@ -257,5 +260,3 @@ class LookOutliner(QtWidgets.QWidget):
         menu.addAction(apply_action)
 
         menu.exec_(globalpos)
-
-

openpype/vendor/python/common/capture.py

@@ -161,37 +161,62 @@ def capture(camera=None,
     cmds.currentTime(cmds.currentTime(query=True))
 
     padding = 10  # Extend panel to accommodate for OS window manager
+
     with _independent_panel(width=width + padding,
                             height=height + padding,
                             off_screen=off_screen) as panel:
         cmds.setFocus(panel)
 
-        with contextlib.nested(
-             _disabled_inview_messages(),
-             _maintain_camera(panel, camera),
-             _applied_viewport_options(viewport_options, panel),
-             _applied_camera_options(camera_options, panel),
-             _applied_display_options(display_options),
-             _applied_viewport2_options(viewport2_options),
-             _isolated_nodes(isolate, panel),
-             _maintained_time()):
+        all_playblast_kwargs = {
+            "compression": compression,
+            "format": format,
+            "percent": 100,
+            "quality": quality,
+            "viewer": viewer,
+            "startTime": start_frame,
+            "endTime": end_frame,
+            "offScreen": off_screen,
+            "showOrnaments": show_ornaments,
+            "forceOverwrite": overwrite,
+            "filename": filename,
+            "widthHeight": [width, height],
+            "rawFrameNumbers": raw_frame_numbers,
+            "framePadding": frame_padding
+        }
+        all_playblast_kwargs.update(playblast_kwargs)
 
-                output = cmds.playblast(
-                    compression=compression,
-                    format=format,
-                    percent=100,
-                    quality=quality,
-                    viewer=viewer,
-                    startTime=start_frame,
-                    endTime=end_frame,
-                    offScreen=off_screen,
-                    showOrnaments=show_ornaments,
-                    forceOverwrite=overwrite,
-                    filename=filename,
-                    widthHeight=[width, height],
-                    rawFrameNumbers=raw_frame_numbers,
-                    framePadding=frame_padding,
-                    **playblast_kwargs)
+        if getattr(contextlib, "nested", None):
+            with contextlib.nested(
+                _disabled_inview_messages(),
+                _maintain_camera(panel, camera),
+                _applied_viewport_options(viewport_options, panel),
+                _applied_camera_options(camera_options, panel),
+                _applied_display_options(display_options),
+                _applied_viewport2_options(viewport2_options),
+                _isolated_nodes(isolate, panel),
+                _maintained_time()
+            ):
+                output = cmds.playblast(**all_playblast_kwargs)
+        else:
+            with contextlib.ExitStack() as stack:
+                stack.enter_context(_disabled_inview_messages())
+                stack.enter_context(_maintain_camera(panel, camera))
+                stack.enter_context(
+                    _applied_viewport_options(viewport_options, panel)
+                )
+                stack.enter_context(
+                    _applied_camera_options(camera_options, panel)
+                )
+                stack.enter_context(
+                    _applied_display_options(display_options)
+                )
+                stack.enter_context(
+                    _applied_viewport2_options(viewport2_options)
+                )
+                stack.enter_context(_isolated_nodes(isolate, panel))
+                stack.enter_context(_maintained_time())
+
+                output = cmds.playblast(**all_playblast_kwargs)
 
         return output
 
@@ -364,7 +389,8 @@ def apply_view(panel, **options):
 
     # Display options
     display_options = options.get("display_options", {})
-    for key, value in display_options.iteritems():
+    _iteritems = getattr(display_options, "iteritems", display_options.items)
+    for key, value in _iteritems():
         if key in _DisplayOptionsRGB:
             cmds.displayRGBColor(key, *value)
         else:
@@ -372,16 +398,21 @@ def apply_view(panel, **options):
 
     # Camera options
     camera_options = options.get("camera_options", {})
-    for key, value in camera_options.iteritems():
+    _iteritems = getattr(camera_options, "iteritems", camera_options.items)
+    for key, value in _iteritems:
         cmds.setAttr("{0}.{1}".format(camera, key), value)
 
     # Viewport options
     viewport_options = options.get("viewport_options", {})
-    for key, value in viewport_options.iteritems():
+    _iteritems = getattr(viewport_options, "iteritems", viewport_options.items)
+    for key, value in _iteritems():
         cmds.modelEditor(panel, edit=True, **{key: value})
 
     viewport2_options = options.get("viewport2_options", {})
-    for key, value in viewport2_options.iteritems():
+    _iteritems = getattr(
+        viewport2_options, "iteritems", viewport2_options.items
+    )
+    for key, value in _iteritems():
         attr = "hardwareRenderingGlobals.{0}".format(key)
         cmds.setAttr(attr, value)
 
@@ -629,14 +660,16 @@ def _applied_camera_options(options, panel):
                              "for capture: %s" % opt)
             options.pop(opt)
 
-    for opt, value in options.iteritems():
+    _iteritems = getattr(options, "iteritems", options.items)
+    for opt, value in _iteritems():
         cmds.setAttr(camera + "." + opt, value)
 
     try:
         yield
     finally:
         if old_options:
-            for opt, value in old_options.iteritems():
+            _iteritems = getattr(old_options, "iteritems", old_options.items)
+            for opt, value in _iteritems():
                 cmds.setAttr(camera + "." + opt, value)
 
 
@@ -722,14 +755,16 @@ def _applied_viewport2_options(options):
             options.pop(opt)
 
     # Apply settings
-    for opt, value in options.iteritems():
+    _iteritems = getattr(options, "iteritems", options.items)
+    for opt, value in _iteritems():
         cmds.setAttr("hardwareRenderingGlobals." + opt, value)
 
     try:
         yield
     finally:
         # Restore previous settings
-        for opt, value in original.iteritems():
+        _iteritems = getattr(original, "iteritems", original.items)
+        for opt, value in _iteritems():
             cmds.setAttr("hardwareRenderingGlobals." + opt, value)
 
 
@@ -769,7 +804,8 @@ def _maintain_camera(panel, camera):
     try:
         yield
     finally:
-        for camera, renderable in state.iteritems():
+        _iteritems = getattr(state, "iteritems", state.items)
+        for camera, renderable in _iteritems():
             cmds.setAttr(camera + ".rnd", renderable)