hotfix for string/py3 compatibility for Maya previews

masqu3rad3 · May 30, 2023 · 2626ebe · 2626ebe
1 parent d8df5c1
commit 2626ebe
Show file tree

Hide file tree

Showing 7 changed files with 761 additions and 4 deletions.
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -10,6 +10,7 @@ Tik Manager Version History
 * **Fix.003** Python 3.x support for imageViewer, project materials and asset library
 * **Fix.004** Asset Library hotfix for Houdini / Max / Nuke
 * **Fix.005** Hotfix for Maya 2024 / deprecated MQtUtil_mainWindow()
+* **Fix.006** Hotfix for Maya 2022+ / string compatibility issue
 
 3.1
 ---

diff --git a/tik_manager/SmMaya.py b/tik_manager/SmMaya.py
@@ -31,6 +31,7 @@
 # -----------------------------------------------------------------------------
 
 import os
+import six
 os.environ["FORCE_QT5"]="0"
 
 # DELETE
@@ -537,7 +538,7 @@ def tearOffPanel(self, panel=None, camera=None, resolution=[1280, 720], override
                 value = overrideDict[key]
             else:
                 value = item[1]
-            if type(value) == unicode or type(value) == str:
+            if isinstance(value, six.string_types):
                 eval ("cmds.modelEditor(pbPanel, e=True, %s='%s')" % (key, value))
             else:
                 eval ("cmds.modelEditor(pbPanel, e=True, %s=%s)" % (key, value))

diff --git a/tik_manager/_version.py b/tik_manager/_version.py
@@ -1 +1 @@
-__version__ = "3.2.005"
+__version__ = "3.2.006"
diff --git a/tik_manager/innoSetup/tikManager_aSetup.iss b/tik_manager/innoSetup/tikManager_aSetup.iss
@@ -4,7 +4,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
 
 #define appName "Tik Manager"
-#define appVersion "3.2.005"
+#define appVersion "3.2.006"
 
 [Setup]
 AppName={#appName}

diff --git a/tik_manager/setup.exe b/tik_manager/setup.exe
diff --git a/utility.py b/utility.py
@@ -406,7 +406,7 @@ def main(argv):
     utility.innoSetupCompile()
     utility.prepareLinuxTar()
 
-    utility.remoteUpload(distributionType="stable")
+    # utility.remoteUpload(distributionType="stable")
 
 if __name__ == "__main__":
     main(sys.argv[1:])