diff --git a/core/AnimationBinder.py b/core/AnimationBinder.py index 2540c88..cb0154c 100644 --- a/core/AnimationBinder.py +++ b/core/AnimationBinder.py @@ -34,13 +34,20 @@ +import sys + import maya.cmds as cmds import pymel.core as pm import Red9.startup.setup as r9Setup -from . import Red9_AnimationUtils as r9Anim -from . import Red9_CoreUtils as r9Core -from . import Red9_General as r9General +if sys.version_info.major > 2: + from . import Red9_AnimationUtils as r9Anim + from . import Red9_CoreUtils as r9Core + from . import Red9_General as r9General +else: + import Red9_AnimationUtils as r9Anim + import Red9_CoreUtils as r9Core + import Red9_General as r9General import logging diff --git a/core/Red9_AnimationUtils.py b/core/Red9_AnimationUtils.py index 2131262..855dd55 100644 --- a/core/Red9_AnimationUtils.py +++ b/core/Red9_AnimationUtils.py @@ -72,16 +72,6 @@ ''' - -import maya.cmds as cmds -import maya.mel as mel - -import Red9.startup.setup as r9Setup -from . import Red9_CoreUtils as r9Core -from . import Red9_General as r9General -from . import Red9_PoseSaver as r9Pose -from . import Red9_Meta as r9Meta - from functools import partial import os import random @@ -91,6 +81,22 @@ import math import traceback +import maya.cmds as cmds +import maya.mel as mel + +import Red9.startup.setup as r9Setup +if sys.version_info.major > 2: + from . import Red9_CoreUtils as r9Core + from . import Red9_General as r9General + from . import Red9_PoseSaver as r9Pose + from . import Red9_Meta as r9Meta +else: + import Red9_CoreUtils as r9Core + import Red9_General as r9General + import Red9_PoseSaver as r9Pose + import Red9_Meta as r9Meta + + import Red9.packages.configobj as configobj @@ -5152,7 +5158,7 @@ def printMirrorDict(self, short=True): if self.unresolved: for key, val in list(self.unresolved.items()): if val: - print('\CLASHING %s Mirror Indexes =====================================================' % key) + print('\nCLASHING %s Mirror Indexes =====================================================' % key) for i in r9Core.sortNumerically(val): print('clashing Index : %s : %s : %s' % (key, i, ', '.join([r9Core.nodeNameStrip(n) for n in val[i]]))) diff --git a/core/Red9_Audio.py b/core/Red9_Audio.py index e3ad9ce..336c3ad 100644 --- a/core/Red9_Audio.py +++ b/core/Red9_Audio.py @@ -22,14 +22,20 @@ import maya.mel as mel from functools import partial import os +import sys # import struct # import math # import re import Red9.startup.setup as r9Setup -from . import Red9_General as r9General -from . import Red9_Meta as r9Meta -from . import Red9_CoreUtils as r9Core +if sys.version_info.major > 2: + from . import Red9_General as r9General + from . import Red9_Meta as r9Meta + from . import Red9_CoreUtils as r9Core +else: + import Red9_General as r9General + import Red9_Meta as r9Meta + import Red9_CoreUtils as r9Core import wave import contextlib diff --git a/core/Red9_CoreUtils.py b/core/Red9_CoreUtils.py index 4ba5857..2b48477 100644 --- a/core/Red9_CoreUtils.py +++ b/core/Red9_CoreUtils.py @@ -26,14 +26,21 @@ import random import math import os +import sys import Red9.packages.configobj as configobj import Red9.startup.setup as r9Setup -from . import Red9_General as r9General -from . import Red9_Audio as r9Audio -from . import Red9_AnimationUtils as r9Anim -from . import Red9_Meta as r9Meta +if sys.version_info.major > 2: + from . import Red9_General as r9General + from . import Red9_Audio as r9Audio + from . import Red9_AnimationUtils as r9Anim + from . import Red9_Meta as r9Meta +else: + import Red9_General as r9General + import Red9_Audio as r9Audio + import Red9_AnimationUtils as r9Anim + import Red9_Meta as r9Meta import logging logging.basicConfig() @@ -1332,7 +1339,7 @@ def lsSearchAttributes(self, searchAttrs, nodes=None, incRoots=True, returnValue If the searchAttrs has an entry in the form **NOT:searchAttr** then this will be forcibly excluded from the filter. Also you can now do **myAttr=2.33** to only pass if the attr is equal similarly **NOT:myAttr=2.33** will exclude if the value is equal - see the "..\Red9\tests\Red9_CoreUtilTests.py" for live unittest examples + see the "..\\Red9\\tests\\Red9_CoreUtilTests.py" for live unittest examples .. note:: current Implementation DOES NOT allow multiple attr tests as only 1 val per key diff --git a/core/Red9_Meta.py b/core/Red9_Meta.py index fb9a930..91e900d 100644 --- a/core/Red9_Meta.py +++ b/core/Red9_Meta.py @@ -55,9 +55,14 @@ import Red9.startup.setup as r9Setup -from . import Red9_General as r9General -from . import Red9_CoreUtils as r9Core -from . import Red9_AnimationUtils as r9Anim +if sys.version_info.major > 2: + from . import Red9_General as r9General + from . import Red9_CoreUtils as r9Core + from . import Red9_AnimationUtils as r9Anim +else: + import Red9_General as r9General + import Red9_CoreUtils as r9Core + import Red9_AnimationUtils as r9Anim import logging logging.basicConfig() diff --git a/core/Red9_PoseSaver.py b/core/Red9_PoseSaver.py index 7866574..f71412b 100644 --- a/core/Red9_PoseSaver.py +++ b/core/Red9_PoseSaver.py @@ -24,22 +24,29 @@ ''' +import os +import sys +import time +import getpass +import json +import traceback import Red9.startup.setup as r9Setup -from . import Red9_CoreUtils as r9Core -from . import Red9_General as r9General -from . import Red9_AnimationUtils as r9Anim -from . import Red9_Meta as r9Meta +if sys.version_info.major > 2: + from . import Red9_CoreUtils as r9Core + from . import Red9_General as r9General + from . import Red9_AnimationUtils as r9Anim + from . import Red9_Meta as r9Meta +else: + import Red9_CoreUtils as r9Core + import Red9_General as r9General + import Red9_AnimationUtils as r9Anim + import Red9_Meta as r9Meta import maya.OpenMaya as OpenMaya import maya.cmds as cmds -import os import Red9.packages.configobj as configobj -import time -import getpass -import json -import traceback import logging diff --git a/core/Red9_Tools.py b/core/Red9_Tools.py index 839d478..23a005c 100644 --- a/core/Red9_Tools.py +++ b/core/Red9_Tools.py @@ -21,10 +21,15 @@ import time import getpass import os +import sys import Red9.startup.setup as r9Setup -from . import Red9_Meta as r9Meta -from . import Red9_AnimationUtils as r9Anim +if sys.version_info.major > 2: + from . import Red9_Meta as r9Meta + from . import Red9_AnimationUtils as r9Anim +else: + import Red9_Meta as r9Meta + import Red9_AnimationUtils as r9Anim import logging logging.basicConfig() diff --git a/core/__init__.py b/core/__init__.py index 41bbcbd..471e197 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -14,34 +14,43 @@ so that the global RED9_META_REGISTERY is built up correctly ''' - -from . import Red9_General as r9General -from . import Red9_Meta as r9Meta -from . import Red9_Tools as r9Tools -from . import Red9_CoreUtils as r9Core -from . import Red9_AnimationUtils as r9Anim -from . import Red9_PoseSaver as r9Pose -from . import Red9_Audio as r9Audio -import importlib - +import sys +if sys.version_info.major > 2: + from importlib import reload + from . import Red9_General as r9General + from . import Red9_Meta as r9Meta + from . import Red9_Tools as r9Tools + from . import Red9_CoreUtils as r9Core + from . import Red9_AnimationUtils as r9Anim + from . import Red9_PoseSaver as r9Pose + from . import Red9_Audio as r9Audio +else: + import Red9_General as r9General + import Red9_Meta as r9Meta + import Red9_Tools as r9Tools + import Red9_CoreUtils as r9Core + import Red9_AnimationUtils as r9Anim + import Red9_PoseSaver as r9Pose + import Red9_Audio as r9Audio def _reload(): ''' reload carefully and re-register the RED9_META_REGISTRY ''' - importlib.reload(r9General) - importlib.reload(r9Meta) - importlib.reload(r9Tools) - importlib.reload(r9Audio) - importlib.reload(r9Core) - importlib.reload(r9Anim) - importlib.reload(r9Pose) + reload(r9General) + reload(r9Meta) + reload(r9Tools) + reload(r9Audio) + reload(r9Core) + reload(r9Anim) + reload(r9Pose) r9Meta.metaData_sceneCleanups() r9Meta.registerMClassInheritanceMapping() print('Red9 Core Reloaded and META REGISTRY updated') + def _setlogginglevel_debug(module='all'): ''' Dev wrapper to set the logging level to debug @@ -53,7 +62,7 @@ def _setlogginglevel_debug(module='all'): r9Anim.log.setLevel(r9Anim.logging.DEBUG) print('Red9_AnimationUtils set to DEBUG state') if module == 'r9General' or module == 'all': - Red9_General.log.setLevel(Red9_General.logging.DEBUG) + r9General.log.setLevel(r9General.logging.DEBUG) print('Red9_General set to DEBUG state') if module == 'r9Tools' or module == 'all': r9Tools.log.setLevel(r9Tools.logging.DEBUG) @@ -80,7 +89,7 @@ def _setlogginglevel_info(module='all'): r9Anim.log.setLevel(r9Anim.logging.INFO) print('Red9_AnimationUtils set to INFO state') if module == 'r9General' or module == 'all': - Red9_General.log.setLevel(Red9_General.logging.INFO) + r9General.log.setLevel(r9General.logging.INFO) print('Red9_General set to INFO state') if module == 'r9Tools' or module == 'all': r9Tools.log.setLevel(r9Tools.logging.INFO) diff --git a/packages/configobj.py b/packages/configobj.py index ba886e8..bc5726f 100644 --- a/packages/configobj.py +++ b/packages/configobj.py @@ -20,7 +20,7 @@ from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF16_BE, BOM_UTF16_LE import six -from _version import __version__ +from ._version import __version__ # imported lazily to avoid startup performance hit if it isn't used compiler = None