[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42138] trunk/blender: pep8 edits and avoid naming conflicts with python builtins
Campbell Barton
ideasman42 at gmail.com
Thu Nov 24 20:36:12 CET 2011
Revision: 42138
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42138
Author: campbellbarton
Date: 2011-11-24 19:36:12 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
pep8 edits and avoid naming conflicts with python builtins
Modified Paths:
--------------
trunk/blender/build_files/buildbot/master.cfg
trunk/blender/build_files/buildbot/slave_pack.py
trunk/blender/doc/python_api/examples/bge.texture.1.py
trunk/blender/intern/cycles/blender/CMakeLists.txt
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/intern/cycles/blender/addon/xml.py
trunk/blender/intern/tools/credits_svn_gen.py
trunk/blender/release/scripts/modules/addon_utils.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/modules/console/complete_calltip.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/release/scripts/startup/bl_ui/properties_render.py
trunk/blender/release/scripts/startup/bl_ui/space_clip.py
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/python/mathutils/mathutils_Euler.c
trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c
trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.c
trunk/blender/source/tests/pep8.py
Modified: trunk/blender/build_files/buildbot/master.cfg
===================================================================
--- trunk/blender/build_files/buildbot/master.cfg 2011-11-24 19:27:15 UTC (rev 42137)
+++ trunk/blender/build_files/buildbot/master.cfg 2011-11-24 19:36:12 UTC (rev 42138)
@@ -75,14 +75,14 @@
return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
-def lib_svn_step(dir):
- return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
+def lib_svn_step(libdir):
+ return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + libdir, mode='update', defaultBranch='trunk', workdir='lib/' + libdir)
# generic builder
-def generic_builder(id, libdir='', branch=''):
- filename = 'buildbot_upload_' + id + '.zip'
+def generic_builder(idname, libdir='', branch=''):
+ filename = 'buildbot_upload_' + idname + '.zip'
compile_script = '../blender/build_files/buildbot/slave_compile.py'
test_script = '../blender/build_files/buildbot/slave_test.py'
pack_script = '../blender/build_files/buildbot/slave_pack.py'
@@ -93,10 +93,10 @@
if libdir != '':
f.addStep(lib_svn_step(libdir))
- f.addStep(Compile(command=['python', compile_script, id]))
- f.addStep(Test(command=['python', test_script, id]))
- f.addStep(ShellCommand(name='package', command=['python', pack_script, id, branch], description='packaging', descriptionDone='packaged'))
- if id.find('cmake') != -1:
+ f.addStep(Compile(command=['python', compile_script, idname]))
+ f.addStep(Test(command=['python', test_script, idname]))
+ f.addStep(ShellCommand(name='package', command=['python', pack_script, idname, branch], description='packaging', descriptionDone='packaged'))
+ if 'cmake' in idname:
f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
else:
f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install'))
Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py 2011-11-24 19:27:15 UTC (rev 42137)
+++ trunk/blender/build_files/buildbot/slave_pack.py 2011-11-24 19:36:12 UTC (rev 42138)
@@ -84,12 +84,12 @@
sys.exit(retcode)
# clean release directory if it already exists
-dir = 'release'
+release_dir = '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(release_dir):
+ for f in os.listdir(release_dir):
+ if os.path.isfile(os.path.join(release_dir, f)):
+ os.remove(os.path.join(release_dir, f))
# create release package
try:
@@ -99,16 +99,16 @@
sys.exit(1)
# find release directory, must exist this time
-if not os.path.exists(dir):
- sys.stderr.write("Failed to find release directory.\n")
+if not os.path.exists(release_dir):
+ sys.stderr.write("Failed to find release directory %r.\n" % release_dir)
sys.exit(1)
# find release package
file = None
filepath = None
-for f in os.listdir(dir):
- rf = os.path.join(dir, f)
+for f in os.listdir(release_dir):
+ rf = os.path.join(release_dir, f)
if os.path.isfile(rf) and f.startswith('blender'):
file = f
filepath = rf
Modified: trunk/blender/doc/python_api/examples/bge.texture.1.py
===================================================================
--- trunk/blender/doc/python_api/examples/bge.texture.1.py 2011-11-24 19:27:15 UTC (rev 42137)
+++ trunk/blender/doc/python_api/examples/bge.texture.1.py 2011-11-24 19:36:12 UTC (rev 42138)
@@ -11,13 +11,13 @@
def createTexture(cont):
"""Create a new Dynamic Texture"""
- object = cont.owner
+ obj = cont.owner
# get the reference pointer (ID) of the internal texture
- ID = texture.materialID(object, 'IMoriginal.png')
+ ID = texture.materialID(obj, 'IMoriginal.png')
# create a texture object
- object_texture = texture.Texture(object, ID)
+ object_texture = texture.Texture(obj, ID)
# create a new source with an external image
url = logic.expandPath("//newtexture.jpg")
Modified: trunk/blender/intern/cycles/blender/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/blender/CMakeLists.txt 2011-11-24 19:27:15 UTC (rev 42137)
+++ trunk/blender/intern/cycles/blender/CMakeLists.txt 2011-11-24 19:36:12 UTC (rev 42138)
@@ -6,7 +6,7 @@
../kernel/svm
../util
../subd
- ../../../intern/guardedalloc
+ ../../guardedalloc
../../../source/blender/makesdna
../../../source/blender/makesrna
../../../source/blender/blenloader
Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py 2011-11-24 19:27:15 UTC (rev 42137)
+++ trunk/blender/intern/cycles/blender/addon/properties.py 2011-11-24 19:36:12 UTC (rev 42138)
@@ -19,7 +19,10 @@
# <pep8 compliant>
import bpy
-from bpy.props import *
+from bpy.props import (EnumProperty,
+ FloatProperty,
+ IntProperty,
+ PointerProperty)
import math
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2011-11-24 19:27:15 UTC (rev 42137)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2011-11-24 19:36:12 UTC (rev 42138)
@@ -349,7 +349,7 @@
ntree = material.node_tree
for node in ntree.nodes:
- if hasattr(node, 'type') and node.type == nodetype:
+ if getattr(node, "type", None) == nodetype:
return node
return None
@@ -363,14 +363,14 @@
return None
-def panel_node_draw(layout, id, output_type, input_name):
- if not id.node_tree:
- layout.prop(id, "use_nodes", icon='NODETREE')
+def panel_node_draw(layout, id_data, output_type, input_name):
+ if not id_data.node_tree:
+ layout.prop(id_data, "use_nodes", icon='NODETREE')
return False
- ntree = id.node_tree
+ ntree = id_data.node_tree
- node = find_node(id, output_type)
+ node = find_node(id_data, output_type)
if not node:
layout.label(text="No output node.")
else:
Modified: trunk/blender/intern/cycles/blender/addon/xml.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/xml.py 2011-11-24 19:27:15 UTC (rev 42137)
+++ trunk/blender/intern/cycles/blender/addon/xml.py 2011-11-24 19:36:12 UTC (rev 42138)
@@ -61,12 +61,12 @@
# get mesh
scene = context.scene
- object = context.object
+ obj = context.object
- if not object:
+ if not obj:
raise Exception("No active object")
- mesh = object.to_mesh(scene, True, 'PREVIEW')
+ mesh = obj.to_mesh(scene, True, 'PREVIEW')
if not mesh:
raise Exception("No mesh data in active object")
Modified: trunk/blender/intern/tools/credits_svn_gen.py
===================================================================
--- trunk/blender/intern/tools/credits_svn_gen.py 2011-11-24 19:27:15 UTC (rev 42137)
+++ trunk/blender/intern/tools/credits_svn_gen.py 2011-11-24 19:36:12 UTC (rev 42138)
@@ -258,6 +258,7 @@
for key, value in author_name_mapping.items():
if not value:
empty.append(key)
+e = None
for e in empty:
author_name_mapping[e] = e.title()
del empty, e
Modified: trunk/blender/release/scripts/modules/addon_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/addon_utils.py 2011-11-24 19:27:15 UTC (rev 42137)
+++ trunk/blender/release/scripts/modules/addon_utils.py 2011-11-24 19:36:12 UTC (rev 42138)
@@ -171,7 +171,9 @@
mod = None
if mod is None:
- mod = fake_module(mod_name, mod_path, force_support=force_support)
+ mod = fake_module(mod_name,
+ mod_path,
+ force_support=force_support)
if mod:
module_cache[mod_name] = mod
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2011-11-24 19:27:15 UTC (rev 42137)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2011-11-24 19:36:12 UTC (rev 42138)
@@ -263,7 +263,7 @@
return None
-def script_paths(subdir=None, user_pref=True, all=False):
+def script_paths(subdir=None, user_pref=True, check_all=False):
"""
Returns a list of valid script paths.
@@ -271,9 +271,9 @@
:type subdir: string
:arg user_pref: Include the user preference script path.
:type user_pref: bool
- :arg all: Include local, user and system paths rather just the paths
+ :arg check_all: Include local, user and system paths rather just the paths
blender uses.
- :type all: bool
+ :type check_all: bool
:return: script paths.
:rtype: list
"""
@@ -286,7 +286,7 @@
else:
user_script_path = None
- if all:
+ if check_all:
# all possible paths
base_paths = tuple(_os.path.join(resource_path(res), "scripts")
for res in ('LOCAL', 'USER', 'SYSTEM'))
@@ -343,7 +343,7 @@
:rtype: list
"""
dirs = []
- for path in script_paths("presets", all=True):
+ for path in script_paths("presets", check_all=True):
directory = _os.path.join(path, subdir)
if not directory.startswith(path):
raise Exception("invalid subdir given %r" % subdir)
@@ -432,9 +432,9 @@
keyconfigs_old = keyconfigs[:]
try:
- file = open(filepath)
- exec(compile(file.read(), filepath, 'exec'), {"__file__": filepath})
- file.close()
+ keyfile = open(filepath)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list