Rigify: Clean up imports

Just removing some unused imports.

I tested generating every built-in metarig to make sure I didn't remove any imports that were actually used. I also tested installing and using a feature-set.

Reviewed By: angavrilov

Differential Revision: https://developer.blender.org/D8026

26 files changed, 29 insertions, 78 deletions

diff --git a/rigify/__init__.py b/rigify/__init__.py
index 6ae597e9..adfa6350 100644
--- a/rigify/__init__.py
+++ b/rigify/__init__.py
@@ -32,7 +32,6 @@ bl_info = {
 import importlib
 import sys
 import bpy
-import os
 
 
 # The order in which core modules of the addon are loaded and reloaded.
diff --git a/rigify/base_rig.py b/rigify/base_rig.py
index b7a5d08c..c4ddc128 100644
--- a/rigify/base_rig.py
+++ b/rigify/base_rig.py
@@ -18,10 +18,6 @@
 
 # <pep8 compliant>
 
-import bpy
-import sys
-import traceback
-
 from .utils.errors import RaiseErrorMixin
 from .utils.bones import BoneDict, BoneUtilityMixin
 from .utils.mechanism import MechanismUtilityMixin
diff --git a/rigify/generate.py b/rigify/generate.py
index 0fe89175..f7929c7b 100644
--- a/rigify/generate.py
+++ b/rigify/generate.py
@@ -21,17 +21,14 @@
 import bpy
 import re
 import time
-import traceback
-import sys
 from rna_prop_ui import rna_idprop_ui_prop_get
 
-from .utils.errors import MetarigError
 from .utils.bones import new_bone
 from .utils.layers import ORG_LAYER, MCH_LAYER, DEF_LAYER, ROOT_LAYER
 from .utils.naming import ORG_PREFIX, MCH_PREFIX, DEF_PREFIX, ROOT_NAME, make_original_name
 from .utils.widgets import WGT_PREFIX
 from .utils.widgets_special import create_root_widget
-from .utils.misc import copy_attributes, gamma_correct, select_object
+from .utils.misc import gamma_correct, select_object
 from .utils.collections import ensure_widget_collection, list_layer_collections, filter_layer_collections_by_object
 
 from . import base_generate
diff --git a/rigify/legacy/rigs/pitchipoy/limbs/arm.py b/rigify/legacy/rigs/pitchipoy/limbs/arm.py
index 2bf0fe6f..2c68c2c0 100644
--- a/rigify/legacy/rigs/pitchipoy/limbs/arm.py
+++ b/rigify/legacy/rigs/pitchipoy/limbs/arm.py
@@ -18,10 +18,8 @@
 
 # <pep8 compliant>
 import bpy
-from ....utils       import MetarigError
-from ....utils       import create_widget, copy_bone
-from ....utils       import strip_org
-from .limb_utils     import *
+from ....utils       import copy_bone
+from .limb_utils     import get_bone_name, make_constraint
 from ..super_widgets import create_hand_widget
 
 from .....utils.mechanism import make_property
diff --git a/rigify/legacy/rigs/pitchipoy/limbs/leg.py b/rigify/legacy/rigs/pitchipoy/limbs/leg.py
index 360a2a49..9abf956f 100644
--- a/rigify/legacy/rigs/pitchipoy/limbs/leg.py
+++ b/rigify/legacy/rigs/pitchipoy/limbs/leg.py
@@ -18,12 +18,11 @@
 
 # <pep8 compliant>
 import bpy, math
-from ....utils       import MetarigError, connected_children_names
-from ....utils       import create_widget, copy_bone, create_circle_widget
-from ....utils       import strip_org, flip_bone, put_bone
+from ....utils       import connected_children_names, create_circle_widget
+from ....utils       import copy_bone, flip_bone, put_bone
 from rna_prop_ui     import rna_idprop_ui_prop_get
 from ..super_widgets import create_foot_widget, create_ballsocket_widget
-from .limb_utils     import *
+from .limb_utils     import orient_bone, make_constraint, get_bone_name
 
 from .....utils.mechanism import make_property
 
diff --git a/rigify/legacy/rigs/pitchipoy/limbs/paw.py b/rigify/legacy/rigs/pitchipoy/limbs/paw.py
index dd9fa1e7..2fdb56f7 100644
--- a/rigify/legacy/rigs/pitchipoy/limbs/paw.py
+++ b/rigify/legacy/rigs/pitchipoy/limbs/paw.py
@@ -18,12 +18,11 @@
 
 # <pep8 compliant>
 import bpy
-from ....utils       import MetarigError, connected_children_names
-from ....utils       import create_widget, copy_bone, create_circle_widget
-from ....utils       import strip_org, flip_bone
+from ....utils       import connected_children_names, create_circle_widget
+from ....utils       import copy_bone, flip_bone
 from rna_prop_ui     import rna_idprop_ui_prop_get
 from ..super_widgets import create_foot_widget, create_ballsocket_widget
-from .limb_utils     import *
+from .limb_utils     import orient_bone, make_constraint, get_bone_name
 
 from .....utils.mechanism import make_property
 
diff --git a/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py b/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
index 5852ad46..daedbaca 100644
--- a/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
+++ b/rigify/legacy/rigs/pitchipoy/limbs/super_limb.py
@@ -3,12 +3,10 @@ from   .arm            import create_arm
 from   .leg            import create_leg
 from   .paw            import create_paw
 from   .ui             import create_script
-from   .limb_utils     import *
+from   .limb_utils     import orient_bone, make_constraint, get_bone_name
 from   mathutils       import Vector
-from   ....utils       import copy_bone, flip_bone, put_bone, create_cube_widget
-from   ....utils       import strip_org, make_deformer_name, create_widget
+from   ....utils       import copy_bone, put_bone, strip_org
 from   ....utils       import create_circle_widget, create_sphere_widget
-from   ....utils       import MetarigError, make_mechanism_name, org
 from   ....utils       import create_limb_widget, connected_children_names
 from   ..super_widgets import create_ikarrow_widget
 from   math            import trunc
diff --git a/rigify/legacy/rigs/pitchipoy/simple_tentacle.py b/rigify/legacy/rigs/pitchipoy/simple_tentacle.py
index facb2b90..46166db9 100644
--- a/rigify/legacy/rigs/pitchipoy/simple_tentacle.py
+++ b/rigify/legacy/rigs/pitchipoy/simple_tentacle.py
@@ -1,10 +1,9 @@
 import bpy
 from ...utils    import copy_bone
 from ...utils    import strip_org, make_deformer_name, connected_children_names
-from ...utils    import make_mechanism_name, put_bone, create_sphere_widget
-from ...utils    import create_widget, create_circle_widget
+from ...utils    import put_bone, create_sphere_widget
+from ...utils    import create_circle_widget
 from ...utils    import MetarigError
-from rna_prop_ui import rna_idprop_ui_prop_get
 
 class Rig:
 
diff --git a/rigify/legacy/rigs/pitchipoy/super_face.py b/rigify/legacy/rigs/pitchipoy/super_face.py
index 5a46299a..45347060 100644
--- a/rigify/legacy/rigs/pitchipoy/super_face.py
+++ b/rigify/legacy/rigs/pitchipoy/super_face.py
@@ -2,8 +2,7 @@ import bpy, re
 from   mathutils      import Vector
 from   ...utils       import copy_bone, flip_bone
 from   ...utils       import org, strip_org, make_deformer_name, connected_children_names, make_mechanism_name
-from   ...utils       import create_circle_widget, create_sphere_widget, create_widget, create_cube_widget
-from   ...utils       import MetarigError
+from   ...utils       import create_widget
 from   .super_widgets import create_face_widget, create_eye_widget, create_eyes_widget, create_ear_widget, create_jaw_widget, create_teeth_widget
 
 from ....utils.mechanism import make_property
diff --git a/rigify/legacy/rigs/pitchipoy/super_finger.py b/rigify/legacy/rigs/pitchipoy/super_finger.py
index a1b7a506..05c32829 100644
--- a/rigify/legacy/rigs/pitchipoy/super_finger.py
+++ b/rigify/legacy/rigs/pitchipoy/super_finger.py
@@ -1,9 +1,7 @@
 import bpy
-from mathutils import Vector
 from ...utils import copy_bone, flip_bone
 from ...utils import strip_org, make_deformer_name, connected_children_names, make_mechanism_name
-from ...utils import create_circle_widget, create_sphere_widget, create_widget
-from ...utils import MetarigError
+from ...utils import MetarigError, create_circle_widget, create_widget
 
 from ....utils.mechanism import make_property
 
diff --git a/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py b/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
index 05c2b4c6..08d06a03 100644
--- a/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
+++ b/rigify/legacy/rigs/pitchipoy/super_torso_turbo.py
@@ -1,8 +1,8 @@
 import bpy
 from mathutils import Vector
-from ...utils import copy_bone, flip_bone, put_bone, org
+from ...utils import copy_bone, put_bone, org
 from ...utils import strip_org, make_deformer_name, connected_children_names
-from ...utils import create_circle_widget, create_sphere_widget, create_widget
+from ...utils import create_circle_widget, create_sphere_widget
 from ...utils import MetarigError, make_mechanism_name, create_cube_widget
 
 from ....utils.mechanism import make_property
diff --git a/rigify/legacy/rigs/pitchipoy/super_widgets.py b/rigify/legacy/rigs/pitchipoy/super_widgets.py
index f442c590..fabc800b 100644
--- a/rigify/legacy/rigs/pitchipoy/super_widgets.py
+++ b/rigify/legacy/rigs/pitchipoy/super_widgets.py
@@ -1,6 +1,3 @@
-import bpy
-import importlib
-import importlib
 from   ...utils import create_widget
 
 MODULE_NAME = "super_widgets"  # Windows/Mac blender is weird, so __package__ doesn't work
diff --git a/rigify/rig_ui_template.py b/rigify/rig_ui_template.py
index 411c9417..4f0ba936 100644
--- a/rigify/rig_ui_template.py
+++ b/rigify/rig_ui_template.py
@@ -23,7 +23,6 @@ import bpy
 from collections import OrderedDict
 
 from .utils.animation import SCRIPT_REGISTER_BAKE, SCRIPT_UTILITIES_BAKE
-from .utils.layers import get_layers
 from .utils.rig import attach_persistent_script
 
 from . import base_generate
diff --git a/rigify/rigs/basic/copy_chain.py b/rigify/rigs/basic/copy_chain.py
index 232671f0..d43a83e5 100644
--- a/rigify/rigs/basic/copy_chain.py
+++ b/rigify/rigs/basic/copy_chain.py
@@ -21,13 +21,7 @@
 import bpy
 
 from ..chain_rigs import SimpleChainRig
-
-from ...utils.errors import MetarigError
-from ...utils.rig import connected_children_names
-from ...utils.naming import make_derived_name
-from ...utils.widgets_basic import create_bone_widget
-
-from ...base_rig import BaseRig, stage
+from ...base_rig import stage
 
 
 class Rig(SimpleChainRig):
diff --git a/rigify/rigs/experimental/super_chain.py b/rigify/rigs/experimental/super_chain.py
index a5af8323..c0a0f09e 100644
--- a/rigify/rigs/experimental/super_chain.py
+++ b/rigify/rigs/experimental/super_chain.py
@@ -5,7 +5,6 @@ from ...utils import strip_org, make_deformer_name, connected_children_names
 from ...utils import create_chain_widget
 from ...utils import make_mechanism_name
 from ...utils import ControlLayersOption
-from rna_prop_ui import rna_idprop_ui_prop_get
 from ..limbs.limb_utils import get_bone_name
 
 
diff --git a/rigify/rigs/faces/super_face.py b/rigify/rigs/faces/super_face.py
index e482a7db..f945a855 100644
--- a/rigify/rigs/faces/super_face.py
+++ b/rigify/rigs/faces/super_face.py
@@ -2,8 +2,7 @@ import bpy, re
 from   mathutils      import Vector
 from   ...utils       import copy_bone, flip_bone
 from   ...utils       import org, strip_org, make_deformer_name, connected_children_names, make_mechanism_name
-from   ...utils       import create_circle_widget, create_sphere_widget, create_widget, create_cube_widget
-from   ...utils       import MetarigError
+from   ...utils       import create_widget
 from   ...utils.mechanism import make_property
 from   ..widgets import create_face_widget, create_eye_widget, create_eyes_widget, create_ear_widget, create_jaw_widget, create_teeth_widget
 
diff --git a/rigify/rigs/limbs/arm.py b/rigify/rigs/limbs/arm.py
index e79edc5c..e554465a 100644
--- a/rigify/rigs/limbs/arm.py
+++ b/rigify/rigs/limbs/arm.py
@@ -20,12 +20,10 @@
 
 import bpy
 
-from itertools import count
 from mathutils import Matrix
 
 from ...utils.bones import put_bone, compute_chain_x_axis, align_bone_x_axis, align_bone_z_axis
 from ...utils.naming import make_derived_name
-from ...utils.misc import map_list
 from ...utils.widgets import adjust_widget_transform_mesh
 
 from ..widgets import create_hand_widget
diff --git a/rigify/rigs/limbs/leg.py b/rigify/rigs/limbs/leg.py
index b409d009..2be7ff35 100644
--- a/rigify/rigs/limbs/leg.py
+++ b/rigify/rigs/limbs/leg.py
@@ -21,14 +21,13 @@
 import bpy
 import math
 
-from itertools import count
 from mathutils import Vector, Matrix
 
 from ...utils.rig import is_rig_base_bone
-from ...utils.bones import align_chain_x_axis, align_bone_x_axis, align_bone_y_axis, align_bone_z_axis
-from ...utils.bones import align_bone_to_axis, flip_bone, put_bone, align_bone_orientation
+from ...utils.bones import align_chain_x_axis, align_bone_x_axis, align_bone_z_axis
+from ...utils.bones import put_bone, align_bone_orientation
 from ...utils.naming import make_derived_name
-from ...utils.misc import map_list, matrix_from_axis_roll, matrix_from_axis_pair
+from ...utils.misc import matrix_from_axis_roll, matrix_from_axis_pair
 from ...utils.widgets import adjust_widget_transform_mesh
 
 from ..widgets import create_foot_widget, create_ballsocket_widget
diff --git a/rigify/rigs/limbs/limb_rigs.py b/rigify/rigs/limbs/limb_rigs.py
index f1eb8639..bb7de5f1 100644
--- a/rigify/rigs/limbs/limb_rigs.py
+++ b/rigify/rigs/limbs/limb_rigs.py
@@ -23,7 +23,7 @@ import json
 
 from ...utils.animation import add_generic_snap_fk_to_ik, add_fk_ik_snap_buttons
 from ...utils.rig import connected_children_names
-from ...utils.bones import BoneDict, put_bone, compute_chain_x_axis, align_bone_orientation, set_bone_widget_transform
+from ...utils.bones import BoneDict, put_bone, align_bone_orientation, set_bone_widget_transform
 from ...utils.naming import strip_org, make_derived_name
 from ...utils.layers import ControlLayersOption
 from ...utils.misc import pairwise_nozip, padnone, map_list
@@ -38,7 +38,7 @@ from ..widgets import create_gear_widget, create_ikarrow_widget
 from ...rig_ui_template import UTILITIES_FUNC_COMMON_IKFK
 
 from math import pi
-from itertools import count, repeat, chain
+from itertools import count, chain
 from mathutils import Vector
 from collections import namedtuple
 
diff --git a/rigify/rigs/limbs/paw.py b/rigify/rigs/limbs/paw.py
index 28374eec..8c130e95 100644
--- a/rigify/rigs/limbs/paw.py
+++ b/rigify/rigs/limbs/paw.py
@@ -19,17 +19,11 @@
 # <pep8 compliant>
 
 import bpy
-import math
 
-from itertools import count
-from mathutils import Vector
-
-from ...utils.bones import compute_chain_x_axis, align_bone_x_axis, align_bone_y_axis, align_bone_z_axis
-from ...utils.bones import align_bone_to_axis, flip_bone, put_bone, align_bone_orientation
+from ...utils.bones import compute_chain_x_axis, align_bone_x_axis, align_bone_z_axis
+from ...utils.bones import align_bone_to_axis, flip_bone
 from ...utils.naming import make_derived_name
-from ...utils.misc import map_list
 
-from ...utils.widgets_basic import create_circle_widget
 from ..widgets import create_foot_widget, create_ballsocket_widget
 
 from ...base_rig import stage
diff --git a/rigify/rigs/limbs/simple_tentacle.py b/rigify/rigs/limbs/simple_tentacle.py
index 25d26e86..bf1b64aa 100644
--- a/rigify/rigs/limbs/simple_tentacle.py
+++ b/rigify/rigs/limbs/simple_tentacle.py
@@ -25,7 +25,6 @@ from itertools import count
 from ...utils.bones import align_chain_x_axis
 from ...utils.widgets_basic import create_circle_widget
 from ...utils.layers import ControlLayersOption
-from ...utils.misc import map_list
 
 from ...base_rig import stage
 
diff --git a/rigify/rigs/limbs/super_finger.py b/rigify/rigs/limbs/super_finger.py
index 978c0e09..ccb9ba22 100644
--- a/rigify/rigs/limbs/super_finger.py
+++ b/rigify/rigs/limbs/super_finger.py
@@ -19,12 +19,10 @@
 # <pep8 compliant>
 
 import bpy
-import re
 import json
 
 from itertools import count
 
-from ...utils.errors import MetarigError
 from ...utils.bones import put_bone, flip_bone, align_chain_x_axis, set_bone_widget_transform
 from ...utils.naming import make_derived_name
 from ...utils.widgets import create_widget
diff --git a/rigify/rigs/spines/basic_spine.py b/rigify/rigs/spines/basic_spine.py
index c2905463..5c64e634 100644
--- a/rigify/rigs/spines/basic_spine.py
+++ b/rigify/rigs/spines/basic_spine.py
@@ -24,9 +24,8 @@ import math
 from itertools import count, repeat
 from mathutils import Matrix
 
-from ...utils.errors import MetarigError
 from ...utils.layers import ControlLayersOption
-from ...utils.naming import strip_org, make_deformer_name, make_mechanism_name, make_derived_name
+from ...utils.naming import strip_org, make_mechanism_name, make_derived_name
 from ...utils.bones import BoneDict, put_bone, align_bone_to_axis, align_bone_orientation, set_bone_widget_transform
 from ...utils.widgets import adjust_widget_transform_mesh
 from ...utils.widgets_basic import create_circle_widget
diff --git a/rigify/rigs/spines/basic_tail.py b/rigify/rigs/spines/basic_tail.py
index be054e7d..b5bf1076 100644
--- a/rigify/rigs/spines/basic_tail.py
+++ b/rigify/rigs/spines/basic_tail.py
@@ -23,15 +23,12 @@ import bpy
 from itertools import count
 
 from ...utils.naming import strip_org, make_derived_name
-from ...utils.bones import put_bone, flip_bone, is_same_position, connect_bbone_chain_handles
-from ...utils.bones import align_bone_orientation, set_bone_widget_transform
+from ...utils.bones import put_bone, set_bone_widget_transform
 from ...utils.widgets_basic import create_circle_widget
-from ...utils.layers import ControlLayersOption
 from ...utils.misc import map_list
 
 from ...base_rig import stage
 
-from ..chain_rigs import TweakChainRig, SimpleChainRig
 from ..widgets import create_ballsocket_widget
 
 from .spine_rigs import BaseHeadTailRig
diff --git a/rigify/rigs/spines/super_head.py b/rigify/rigs/spines/super_head.py
index b1ba9ee0..eb19c304 100644
--- a/rigify/rigs/spines/super_head.py
+++ b/rigify/rigs/spines/super_head.py
@@ -24,7 +24,7 @@ from itertools import count
 
 from ...utils.naming import make_derived_name
 from ...utils.bones import align_bone_orientation
-from ...utils.widgets_basic import create_circle_widget, create_cube_widget
+from ...utils.widgets_basic import create_circle_widget
 from ...utils.widgets_special import create_neck_bend_widget, create_neck_tweak_widget
 from ...utils.switch_parent import SwitchParentBuilder
 from ...utils.misc import map_list
diff --git a/rigify/rigs/widgets.py b/rigify/rigs/widgets.py
index aebe7139..507d5422 100644
--- a/rigify/rigs/widgets.py
+++ b/rigify/rigs/widgets.py
@@ -1,6 +1,3 @@
-import bpy
-import importlib
-import importlib
 from mathutils import Matrix
 from ..utils import create_widget