[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35928] trunk/blender: pep8 checker, mostly pedantic style changes but also found an error in mesh_utils. mesh_linked_faces()
Campbell Barton
ideasman42 at gmail.com
Fri Apr 1 04:41:16 CEST 2011
Revision: 35928
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35928
Author: campbellbarton
Date: 2011-04-01 02:41:15 +0000 (Fri, 01 Apr 2011)
Log Message:
-----------
pep8 checker, mostly pedantic style changes but also found an error in mesh_utils.mesh_linked_faces()
Modified Paths:
--------------
trunk/blender/build_files/buildbot/master_unpack.py
trunk/blender/build_files/buildbot/slave_pack.py
trunk/blender/build_files/cmake/cmake_qtcreator_project.py
trunk/blender/build_files/cmake/example_scripts/make_quicky.py
trunk/blender/release/scripts/modules/addon_utils.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/modules/bpyml_ui.py
trunk/blender/release/scripts/modules/mesh_utils.py
trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
trunk/blender/release/scripts/startup/bl_operators/presets.py
trunk/blender/release/scripts/startup/bl_operators/wm.py
trunk/blender/release/scripts/startup/bl_ui/properties_animviz.py
trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/release/scripts/templates/operator_modal_timer.py
trunk/blender/source/tests/bl_run_operators.py
Modified: trunk/blender/build_files/buildbot/master_unpack.py
===================================================================
--- trunk/blender/build_files/buildbot/master_unpack.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/build_files/buildbot/master_unpack.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -94,11 +94,11 @@
sys.exit(1)
# extract
-dir = 'public_html/download'
+directory = 'public_html/download'
try:
zf = z.open(package)
- f = file(os.path.join(dir, packagename), "wb")
+ f = file(os.path.join(directory, packagename), "wb")
shutil.copyfileobj(zf, f)
@@ -112,10 +112,10 @@
# remove other files from the same platform
try:
- for f in os.listdir(dir):
+ for f in os.listdir(directory):
if platform.lower() in f.lower():
if f != packagename:
- os.remove(os.path.join(dir, f))
+ os.remove(os.path.join(directory, f))
except Exception, ex:
sys.stderr.write('Failed to remove old packages: %s\n' % str(ex))
sys.exit(1)
Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/build_files/buildbot/slave_pack.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -41,12 +41,12 @@
sys.exit(retcode)
# clean release directory if it already exists
-dir = 'release'
+directory = 'release'
-if os.path.exists(dir):
- for f in os.listdir(dir):
- if os.path.isfile(os.path.join(dir, f)):
- os.remove(os.path.join(dir, f))
+if os.path.exists(directory):
+ for f in os.listdir(directory):
+ if os.path.isfile(os.path.join(directory, f)):
+ os.remove(os.path.join(directory, f))
# create release package
try:
@@ -56,7 +56,7 @@
sys.exit(1)
# find release directory, must exist this time
-if not os.path.exists(dir):
+if not os.path.exists(directory):
sys.stderr.write("Failed to find release directory.\n")
sys.exit(1)
@@ -64,8 +64,8 @@
file = None
filepath = None
-for f in os.listdir(dir):
- rf = os.path.join(dir, f)
+for f in os.listdir(directory):
+ rf = os.path.join(directory, f)
if os.path.isfile(rf) and f.startswith('blender'):
file = f
filepath = rf
Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -114,7 +114,6 @@
"""
def create_eclipse_project(CMAKE_DIR):
- import sys
if sys.platform == "win32":
cmd = 'cmake %r -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
else:
@@ -125,8 +124,8 @@
includes = []
defines = []
- import os
+
create_eclipse_project(CMAKE_DIR)
from xml.dom.minidom import parse
Modified: trunk/blender/build_files/cmake/example_scripts/make_quicky.py
===================================================================
--- trunk/blender/build_files/cmake/example_scripts/make_quicky.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/build_files/cmake/example_scripts/make_quicky.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -43,8 +43,8 @@
targets = set()
# collect targets
- file = open("Makefile", "r")
- for line in file:
+ makefile = open("Makefile", "r")
+ for line in makefile:
line = line.rstrip()
if not line or line[0] in ". \t@$#":
continue
@@ -59,7 +59,7 @@
continue
targets.add(line)
- file.close()
+ makefile.close()
# remove cmake targets
bad = set([
Modified: trunk/blender/release/scripts/modules/addon_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/addon_utils.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/release/scripts/modules/addon_utils.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -107,7 +107,7 @@
import traceback
traceback.print_exc()
raise
-
+
return mod
else:
return None
@@ -246,7 +246,6 @@
:type module_name: string
"""
import sys
- import traceback
import bpy_types as _bpy_types
mod = sys.modules.get(module_name)
@@ -259,6 +258,7 @@
try:
mod.unregister()
except:
+ import traceback
traceback.print_exc()
else:
print("addon_utils.disable", module_name, "not loaded")
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -347,7 +347,6 @@
print("loading preset:", filepath)
keyconfigs = _bpy.context.window_manager.keyconfigs
- kc_orig = keyconfigs.active
keyconfigs_old = keyconfigs[:]
Modified: trunk/blender/release/scripts/modules/bpyml_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/bpyml_ui.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/release/scripts/modules/bpyml_ui.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -65,7 +65,7 @@
def _call_recursive(context, base, py_node):
- prop = base.bl_rna.properties.get(py_node[TAG])
+ # prop = base.bl_rna.properties.get(py_node[TAG])
if py_node[TAG] in base.bl_rna.properties:
value = py_node[ARGS].get("expr")
if value:
@@ -73,7 +73,7 @@
setattr(base, py_node[TAG], value)
else:
value = py_node[ARGS]['value'] # have to have this
- setattr(base, name, value)
+ setattr(base, py_node[TAG], value)
else:
args = _parse_rna_args(base, py_node)
func_new = getattr(base, py_node[TAG])
Modified: trunk/blender/release/scripts/modules/mesh_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/mesh_utils.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/release/scripts/modules/mesh_utils.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -19,7 +19,7 @@
# <pep8 compliant>
-def mesh_linked_faces(me):
+def mesh_linked_faces(mesh):
'''
Splits the mesh into connected parts,
these parts are returned as lists of faces.
Modified: trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/release/scripts/startup/bl_operators/object_quick_effects.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -18,7 +18,6 @@
# <pep8 compliant>
-import mathutils
from mathutils import Vector
import bpy
from bpy.props import BoolProperty, EnumProperty, IntProperty, FloatProperty, FloatVectorProperty
@@ -80,6 +79,7 @@
return {'FINISHED'}
+
def obj_bb_minmax(obj, min_co, max_co):
for i in range(0, 8):
bb_vec = Vector((obj.bound_box[i][0], obj.bound_box[i][1], obj.bound_box[i][2])) * obj.matrix_world
@@ -91,6 +91,7 @@
max_co[1] = max(bb_vec[1], max_co[1])
max_co[2] = max(bb_vec[2], max_co[2])
+
class MakeSmoke(bpy.types.Operator):
bl_idname = "object.make_smoke"
bl_label = "Make Smoke"
@@ -148,8 +149,8 @@
obj.name = "Smoke Domain"
# give the smoke some room above the flows
- obj.location = 0.5 * (max_co + min_co) + Vector((0,0,1))
- obj.scale = 0.5 * (max_co - min_co) + Vector((1,1,2))
+ obj.location = 0.5 * (max_co + min_co) + Vector((0.0, 0.0, 1.0))
+ obj.scale = 0.5 * (max_co - min_co) + Vector((1.0, 1.0, 2.0))
# setup smoke domain
bpy.ops.object.modifier_add({"object": obj}, type='SMOKE')
@@ -261,8 +262,8 @@
# give the fluid some room below the flows and scale with initial velocity
v = 0.5 * self.initial_velocity
- obj.location = 0.5 * (max_co + min_co) + Vector((0,0,-1)) + v
- obj.scale = 0.5 * (max_co - min_co) + Vector((1,1,2)) + Vector((abs(v[0]), abs(v[1]), abs(v[2])))
+ obj.location = 0.5 * (max_co + min_co) + Vector((0.0, 0.0, -1.0)) + v
+ obj.scale = 0.5 * (max_co - min_co) + Vector((1.0, 1.0, 2.0)) + Vector((abs(v[0]), abs(v[1]), abs(v[2])))
# setup smoke domain
bpy.ops.object.modifier_add({"object": obj}, type='FLUID_SIMULATION')
@@ -279,7 +280,7 @@
mat.specular_intensity = 1
mat.specular_hardness = 100
mat.use_transparency = True
- mat.alpha = 0
+ mat.alpha = 0.0
mat.transparency_method = 'RAYTRACE'
mat.raytrace_transparency.ior = 1.33
mat.raytrace_transparency.depth = 4
Modified: trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/release/scripts/startup/bl_operators/object_randomize_transform.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -84,7 +84,7 @@
uniform(0.0, 0.0), uniform(0.0, 0.0), uniform(0.0, 0.0)
-from bpy.props import IntProperty, BoolProperty, FloatProperty, FloatVectorProperty
+from bpy.props import IntProperty, BoolProperty, FloatVectorProperty
class RandomizeLocRotSize(bpy.types.Operator):
Modified: trunk/blender/release/scripts/startup/bl_operators/presets.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/presets.py 2011-03-31 20:59:55 UTC (rev 35927)
+++ trunk/blender/release/scripts/startup/bl_operators/presets.py 2011-04-01 02:41:15 UTC (rev 35928)
@@ -19,7 +19,6 @@
# <pep8 compliant>
import bpy
-import os
class AddPresetBase():
Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list