[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35223] trunk/blender: replace import *' s with named imports ( using * is convenient for some scripts but considered bad practice by python devs )
Campbell Barton
ideasman42 at gmail.com
Sun Feb 27 16:25:25 CET 2011
Revision: 35223
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35223
Author: campbellbarton
Date: 2011-02-27 15:25:24 +0000 (Sun, 27 Feb 2011)
Log Message:
-----------
replace import *'s with named imports (using * is convenient for some scripts but considered bad practice by python devs)
Modified Paths:
--------------
trunk/blender/release/scripts/keyingsets/keyingsets_builtins.py
trunk/blender/release/scripts/modules/io_utils.py
trunk/blender/release/scripts/op/add_mesh_torus.py
trunk/blender/release/scripts/op/nla.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/object_align.py
trunk/blender/release/scripts/op/object_randomize_transform.py
trunk/blender/release/scripts/op/sequencer.py
trunk/blender/release/scripts/op/uv.py
trunk/blender/release/scripts/op/uvcalc_smart_project.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/templates/builtin_keyingset.py
trunk/blender/release/scripts/templates/operator_export.py
trunk/blender/release/scripts/templates/operator_mesh_add.py
trunk/blender/release/scripts/templates/operator_modal.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/space_console.py
trunk/blender/release/scripts/ui/space_userpref_keymap.py
trunk/blender/source/tests/pep8.py
Modified: trunk/blender/release/scripts/keyingsets/keyingsets_builtins.py
===================================================================
--- trunk/blender/release/scripts/keyingsets/keyingsets_builtins.py 2011-02-27 14:16:32 UTC (rev 35222)
+++ trunk/blender/release/scripts/keyingsets/keyingsets_builtins.py 2011-02-27 15:25:24 UTC (rev 35223)
@@ -26,7 +26,7 @@
"""
import bpy
-from keyingsets_utils import *
+import keyingsets_utils
###############################
# Built-In KeyingSets
@@ -37,13 +37,13 @@
bl_label = "Location"
# poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
+ poll = keyingsets_utils.RKS_POLL_selected_items
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator - use callback for location
- generate = RKS_GEN_location
+ generate = keyingsets_utils.RKS_GEN_location
# Rotation
@@ -51,13 +51,13 @@
bl_label = "Rotation"
# poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
+ poll = keyingsets_utils.RKS_POLL_selected_items
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator - use callback for location
- generate = RKS_GEN_rotation
+ generate = keyingsets_utils.RKS_GEN_rotation
# Scale
@@ -65,13 +65,13 @@
bl_label = "Scaling"
# poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
+ poll = keyingsets_utils.RKS_POLL_selected_items
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator - use callback for location
- generate = RKS_GEN_scaling
+ generate = keyingsets_utils.RKS_GEN_scaling
# ------------
@@ -81,17 +81,17 @@
bl_label = "LocRot"
# poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
+ poll = keyingsets_utils.RKS_POLL_selected_items
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator
def generate(self, context, ks, data):
# location
- RKS_GEN_location(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_location(self, context, ks, data)
# rotation
- RKS_GEN_rotation(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_rotation(self, context, ks, data)
# LocScale
@@ -99,17 +99,17 @@
bl_label = "LocScale"
# poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
+ poll = keyingsets_utils.RKS_POLL_selected_items
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator
def generate(self, context, ks, data):
# location
- RKS_GEN_location(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_location(self, context, ks, data)
# scale
- RKS_GEN_scaling(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_scaling(self, context, ks, data)
# LocRotScale
@@ -117,19 +117,19 @@
bl_label = "LocRotScale"
# poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
+ poll = keyingsets_utils.RKS_POLL_selected_items
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator
def generate(self, context, ks, data):
# location
- RKS_GEN_location(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_location(self, context, ks, data)
# rotation
- RKS_GEN_rotation(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_rotation(self, context, ks, data)
# scale
- RKS_GEN_scaling(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_scaling(self, context, ks, data)
# RotScale
@@ -137,17 +137,17 @@
bl_label = "RotScale"
# poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
+ poll = keyingsets_utils.RKS_POLL_selected_items
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator
def generate(self, context, ks, data):
# rotation
- RKS_GEN_rotation(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_rotation(self, context, ks, data)
# scaling
- RKS_GEN_scaling(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_scaling(self, context, ks, data)
# ------------
@@ -159,13 +159,13 @@
bl_options = {'INSERTKEY_VISUAL'}
# poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
+ poll = keyingsets_utils.RKS_POLL_selected_items
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator - use callback for location
- generate = RKS_GEN_location
+ generate = keyingsets_utils.RKS_GEN_location
# Rotation
@@ -175,13 +175,13 @@
bl_options = {'INSERTKEY_VISUAL'}
# poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
+ poll = keyingsets_utils.RKS_POLL_selected_items
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator - use callback for rotation
- generate = RKS_GEN_rotation
+ generate = keyingsets_utils.RKS_GEN_rotation
# VisualLocRot
@@ -191,17 +191,17 @@
bl_options = {'INSERTKEY_VISUAL'}
# poll - use predefined callback for selected bones/objects
- poll = RKS_POLL_selected_items
+ poll = keyingsets_utils.RKS_POLL_selected_items
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator
def generate(self, context, ks, data):
# location
- RKS_GEN_location(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_location(self, context, ks, data)
# rotation
- RKS_GEN_rotation(self, context, ks, data)
+ keyingsets_utils.RKS_GEN_rotation(self, context, ks, data)
# ------------
@@ -213,13 +213,13 @@
# poll - use predefined callback for selected objects
# TODO: this should really check whether the selected object (or datablock)
# has any animation data defined yet
- poll = RKS_POLL_selected_objects
+ poll = keyingsets_utils.RKS_POLL_selected_objects
# iterator - use callback for selected bones/objects
- iterator = RKS_ITER_selected_item
+ iterator = keyingsets_utils.RKS_ITER_selected_item
# generator - use callback for doing this
- generate = RKS_GEN_available
+ generate = keyingsets_utils.RKS_GEN_available
###############################
@@ -278,7 +278,7 @@
path = id_path + prop
else:
# standard transforms/properties
- path = path_add_property(id_path, prop)
+ path = keyingsets_utils.path_add_property(id_path, prop)
# add Keying Set entry for this...
if use_groups:
@@ -363,5 +363,3 @@
if __name__ == "__main__":
register()
-
-###############################
Modified: trunk/blender/release/scripts/modules/io_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/io_utils.py 2011-02-27 14:16:32 UTC (rev 35222)
+++ trunk/blender/release/scripts/modules/io_utils.py 2011-02-27 15:25:24 UTC (rev 35223)
@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
-from bpy.props import *
+from bpy.props import StringProperty, BoolProperty
class ExportHelper:
Modified: trunk/blender/release/scripts/op/add_mesh_torus.py
===================================================================
--- trunk/blender/release/scripts/op/add_mesh_torus.py 2011-02-27 14:16:32 UTC (rev 35222)
+++ trunk/blender/release/scripts/op/add_mesh_torus.py 2011-02-27 15:25:24 UTC (rev 35223)
@@ -72,7 +72,7 @@
return verts, faces
-from bpy.props import *
+from bpy.props import FloatProperty, IntProperty, BoolProperty, FloatVectorProperty
class AddTorus(bpy.types.Operator):
Modified: trunk/blender/release/scripts/op/nla.py
===================================================================
--- trunk/blender/release/scripts/op/nla.py 2011-02-27 14:16:32 UTC (rev 35222)
+++ trunk/blender/release/scripts/op/nla.py 2011-02-27 15:25:24 UTC (rev 35223)
@@ -124,7 +124,7 @@
return action
-from bpy.props import *
+from bpy.props import IntProperty, BoolProperty
class BakeAction(bpy.types.Operator):
Modified: trunk/blender/release/scripts/op/object.py
===================================================================
--- trunk/blender/release/scripts/op/object.py 2011-02-27 14:16:32 UTC (rev 35222)
+++ trunk/blender/release/scripts/op/object.py 2011-02-27 15:25:24 UTC (rev 35223)
@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
-from bpy.props import *
+from bpy.props import StringProperty, BoolProperty, EnumProperty, IntProperty
class SelectPattern(bpy.types.Operator):
Modified: trunk/blender/release/scripts/op/object_align.py
===================================================================
--- trunk/blender/release/scripts/op/object_align.py 2011-02-27 14:16:32 UTC (rev 35222)
+++ trunk/blender/release/scripts/op/object_align.py 2011-02-27 15:25:24 UTC (rev 35223)
@@ -230,7 +230,7 @@
return True
-from bpy.props import *
+from bpy.props import EnumProperty
class AlignObjects(bpy.types.Operator):
@@ -239,7 +239,7 @@
bl_label = "Align Objects"
bl_options = {'REGISTER', 'UNDO'}
- align_mode = bpy.props.EnumProperty(items=(
+ align_mode = EnumProperty(items=(
('OPT_1', "Negative Sides", ""),
('OPT_2', "Centers", ""),
('OPT_3', "Positive Sides", "")),
@@ -247,7 +247,7 @@
description="",
default='OPT_2')
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list