Skip to content

Commit ed373a2

Browse files
committed
Core: Fix remaining six.py relative imports and replace imp module
Replace all 17 remaining from .six relative imports with inline constants (string_types = str, PY2 = False). Replace imp.load_source with importlib.util in custom_step_widget.py and rbf_manager_ui.py (imp module removed in Python 3.12/Maya 2027).
1 parent 9bd60b1 commit ed373a2

19 files changed

Lines changed: 29 additions & 21 deletions

release/scripts/mgear/core/anim_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import traceback
44
from functools import partial
55

6-
from .six import PY2
6+
PY2 = False
77

88
# Maya imports
99
from maya import cmds

release/scripts/mgear/core/applyop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from mgear.pymaya import datatypes
1818

1919
import maya.api.OpenMaya as om
20-
from .six import string_types
20+
string_types = str
2121

2222
from mgear.core import attribute
2323
from mgear.core import surface

release/scripts/mgear/core/attribute.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import mgear
1212
import mgear.pymaya as pm
1313
import mgear.pymaya.datatypes as datatypes
14-
from .six import string_types
14+
string_types = str
1515

1616
#############################################
1717
# NODE

release/scripts/mgear/core/curve.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from mgear.core import utils
2020
from mgear.core import transform
2121

22-
from .six import string_types
22+
string_types = str
2323

2424
#############################################
2525
# CURVE

release/scripts/mgear/core/dagmenu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from mgear.shifter import io
4040
from mgear.shifter import guide_template
4141

42-
from .six import string_types
42+
string_types = str
4343

4444
from mgear.vendor.Qt import QtWidgets
4545
from mgear.compatible import compatible_comp_dagmenu

release/scripts/mgear/core/node.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import mgear.pymaya.datatypes as datatypes
77
from mgear.core import attribute
88

9-
from .six import PY2, string_types
9+
PY2 = False
10+
string_types = str
1011

1112
# Type tuple for faster isinstance checks (used frequently in node creation)
1213
_CONNECTABLE_TYPES = None

release/scripts/mgear/core/pyqt.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from mgear.vendor.Qt import QtGui
1717
from mgear.vendor.Qt import QtSvg
1818
from mgear.vendor.Qt import QtCore
19-
from .six import PY2
19+
PY2 = False
2020

2121
# Try importing PySide6, fall back to PySide2 if not available
2222
try:

release/scripts/mgear/core/skin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from maya import cmds
1919
import maya.OpenMaya as OpenMaya
2020
import maya.OpenMayaAnim as OpenMayaAnim
21-
from .six import string_types
21+
string_types = str
2222
from mgear.vendor.Qt import QtWidgets
2323
from mgear.vendor.Qt import QtCore
2424
from mgear.vendor.Qt import QtGui

release/scripts/mgear/core/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
import mgear.pymaya as pm
1313
from maya import mel
1414
import maya.api.OpenMaya as OpenMaya
15-
from .six import string_types, PY2
15+
string_types = str
16+
PY2 = False
1617

1718
import mgear
1819

release/scripts/mgear/core/wmap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from maya import cmds
66
import mgear.pymaya as pm
77
import maya.OpenMaya as OpenMaya
8-
from .six import string_types
8+
string_types = str
99

1010
FILE_EXT = ".wmap"
1111

0 commit comments

Comments
 (0)