[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55652] trunk/blender: code cleanup: python/pep8 and double-promotion warnings.
Campbell Barton
ideasman42 at gmail.com
Thu Mar 28 20:33:15 CET 2013
Revision: 55652
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55652
Author: campbellbarton
Date: 2013-03-28 19:33:14 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
code cleanup: python/pep8 and double-promotion warnings.
Modified Paths:
--------------
trunk/blender/build_files/buildbot/slave_compile.py
trunk/blender/intern/cycles/blender/addon/properties.py
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py
trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py
trunk/blender/release/scripts/modules/bpy_extras/anim_utils.py
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/modules/console/complete_import.py
trunk/blender/release/scripts/startup/bl_operators/node.py
trunk/blender/release/scripts/startup/bl_operators/rigidbody.py
trunk/blender/release/scripts/startup/bl_operators/wm.py
trunk/blender/release/scripts/startup/bl_ui/properties_paint_common.py
trunk/blender/release/scripts/startup/bl_ui/properties_render.py
trunk/blender/release/scripts/startup/bl_ui/space_image.py
trunk/blender/release/scripts/startup/bl_ui/space_nla.py
trunk/blender/release/scripts/startup/bl_ui/space_node.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/tools/check_style_c.py
trunk/blender/source/tools/spell_check_source_config.py
Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py 2013-03-28 18:04:07 UTC (rev 55651)
+++ trunk/blender/build_files/buildbot/slave_compile.py 2013-03-28 19:33:14 UTC (rev 55652)
@@ -156,9 +156,9 @@
if builder.find('win') != -1:
dlls = ('msvcm90.dll', 'msvcp90.dll', 'msvcr90.dll', 'vcomp90.dll', 'Microsoft.VC90.CRT.manifest', 'Microsoft.VC90.OpenMP.manifest')
if builder.find('win64') == -1:
- dlls_path = 'C:\\b\\redist\\x86'
+ dlls_path = 'C:\\b\\redist\\x86'
else:
- dlls_path = 'C:\\b\\redist\\amd64'
+ dlls_path = 'C:\\b\\redist\\amd64'
for dll in dlls:
shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll))
Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py 2013-03-28 18:04:07 UTC (rev 55651)
+++ trunk/blender/intern/cycles/blender/addon/properties.py 2013-03-28 19:33:14 UTC (rev 55652)
@@ -416,7 +416,7 @@
default=0.0,
step=1,
precision=4,
- subtype = 'DISTANCE'
+ subtype='DISTANCE',
)
cls.aperture_blades = IntProperty(
name="Aperture Blades",
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2013-03-28 18:04:07 UTC (rev 55651)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-03-28 19:33:14 UTC (rev 55652)
@@ -219,7 +219,7 @@
sub.label(text="Final Render:")
sub.prop(rd, "use_persistent_data", text="Persistent Images")
-
+
class CyclesRender_PT_opengl(CyclesButtonsPanel, Panel):
bl_label = "OpenGL Render"
bl_options = {'DEFAULT_CLOSED'}
@@ -230,18 +230,18 @@
rd = context.scene.render
split = layout.split()
-
+
col = split.column()
col.prop(rd, "use_antialiasing")
sub = col.row()
sub.active = rd.use_antialiasing
sub.prop(rd, "antialiasing_samples", expand=True)
-
+
col = split.column()
col.label(text="Alpha:")
col.prop(rd, "alpha_mode", text="")
-
-
+
+
class CyclesRender_PT_layers(CyclesButtonsPanel, Panel):
bl_label = "Layers"
bl_options = {'DEFAULT_CLOSED'}
@@ -872,8 +872,8 @@
split = layout.split(percentage=0.2)
split.label(text="Type:")
split.prop(tex, "type", text="")
-
-
+
+
class CyclesTexture_PT_node(CyclesButtonsPanel, Panel):
bl_label = "Node"
bl_context = "texture"
@@ -902,7 +902,7 @@
def draw(self, context):
layout = self.layout
-
+
node = context.texture_node
mapping = node.texture_mapping
@@ -934,7 +934,7 @@
def draw(self, context):
layout = self.layout
-
+
node = context.texture_node
mapping = node.color_mapping
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py 2013-03-28 18:04:07 UTC (rev 55651)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py 2013-03-28 19:33:14 UTC (rev 55652)
@@ -446,7 +446,7 @@
nds_ls.extend(nds)
ret = _extract_string_merge(estr_ls, nds_ls)
return ret
-
+
def extract_strings_split(node):
"""
Returns a list args as returned by 'extract_strings()', But split into groups based on separate_nodes, this way
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py 2013-03-28 18:04:07 UTC (rev 55651)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/settings.py 2013-03-28 19:33:14 UTC (rev 55652)
@@ -240,7 +240,7 @@
for it in ("IFACE_", "TIP_", "DATA_", "N_")) +
tuple((r"{}\(\s*" + _ctxt_re + r"\s*,\s*" + _msg_re + r"\s*\)").format(it)
- for it in ("CTX_IFACE_", "CTX_TIP_", "CTX_DATA_", "CTX_N_")) +
+ for it in ("CTX_IFACE_", "CTX_TIP_", "CTX_DATA_", "CTX_N_")) +
tuple(("{}\\((?:[^\"',]+,){{1,2}}\\s*" + _msg_re + r"\s*(?:\)|,)").format(it)
for it in ("BKE_report", "BKE_reportf", "BKE_reports_prepend", "BKE_reports_prependf",
@@ -252,7 +252,7 @@
tuple(("{}\\((?:[^\"',]+,)\\s*" + _msg_re + r"\s*(?:\)|,)").format(it)
for it in ("modifier_setError",)) +
- tuple((r"{}\(\s*" + _msg_re + r"\s*,\s*(?:" + \
+ tuple((r"{}\(\s*" + _msg_re + r"\s*,\s*(?:" +
r"\s*,\s*)?(?:".join(_ctxt_re_gen(i) for i in range(PYGETTEXT_MAX_MULTI_CTXT)) + r")?\s*\)").format(it)
for it in ("BLF_I18N_MSGID_MULTI_CTXT",))
)
@@ -354,7 +354,7 @@
PARSER_PY_MARKER_BEGIN = "\n# ##### BEGIN AUTOGENERATED I18N SECTION #####\n"
PARSER_PY_MARKER_END = "\n# ##### END AUTOGENERATED I18N SECTION #####\n"
-PARSER_MAX_FILE_SIZE = 2**24 # in bytes, i.e. 16 Mb.
+PARSER_MAX_FILE_SIZE = 2 ** 24 # in bytes, i.e. 16 Mb.
###############################################################################
# PATHS
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py 2013-03-28 18:04:07 UTC (rev 55651)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py 2013-03-28 19:33:14 UTC (rev 55652)
@@ -173,7 +173,7 @@
self.comment_lines.remove(l)
lines_src = []
lines_src_custom = []
- for src in sources:
+ for src in sources:
if is_valid_po_path(src):
lines_src.append(self.settings.PO_COMMENT_PREFIX_SOURCE + src)
else:
Modified: trunk/blender/release/scripts/modules/bpy_extras/anim_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/anim_utils.py 2013-03-28 18:04:07 UTC (rev 55651)
+++ trunk/blender/release/scripts/modules/bpy_extras/anim_utils.py 2013-03-28 19:33:14 UTC (rev 55652)
@@ -169,7 +169,7 @@
euler_prev = None
for (f, matrix) in zip(frame_range, obj_info):
- name = "Action Bake" # XXX: placeholder
+ name = "Action Bake" # XXX: placeholder
obj.matrix_basis = matrix
obj.keyframe_insert("location", -1, f, name, options)
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2013-03-28 18:04:07 UTC (rev 55651)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2013-03-28 19:33:14 UTC (rev 55652)
@@ -729,6 +729,7 @@
self.preset_operator,
filter_ext=lambda ext: ext.lower() in {".py", ".xml"})
+
class Region(StructRNA):
__slots__ = ()
@@ -782,9 +783,11 @@
if ch == '_' or ch.isalpha() or ch.isdigit():
yield ch
+
def sanitize_identifier(name):
return ''.join(gen_valid_identifier(name))
+
def unique_identifier(name, identifier_list):
# First some basic sanitation, to make a usable identifier string from the name
base = sanitize_identifier(name)
@@ -796,6 +799,7 @@
identifier = base + str(index)
return identifier
+
class RNAMetaNode(RNAMetaPropGroup):
def __new__(cls, name, bases, classdict, **args):
# Wrapper for node.init, to add sockets from templates
@@ -846,7 +850,7 @@
@classmethod
def poll(cls, ntree):
- return True
+ return True
class NodeSocket(StructRNA, metaclass=RNAMetaPropGroup):
@@ -870,17 +874,18 @@
@classmethod
def poll(cls, ntree):
- return ntree.bl_idname == 'CompositorNodeTree'
+ return ntree.bl_idname == 'CompositorNodeTree'
def update(self):
self.tag_need_exec()
+
class ShaderNode(Node):
__slots__ = ()
@classmethod
def poll(cls, ntree):
- return ntree.bl_idname == 'ShaderNodeTree'
+ return ntree.bl_idname == 'ShaderNodeTree'
class TextureNode(Node):
@@ -888,5 +893,4 @@
@classmethod
def poll(cls, ntree):
- return ntree.bl_idname == 'TextureNodeTree'
-
+ return ntree.bl_idname == 'TextureNodeTree'
Modified: trunk/blender/release/scripts/modules/console/complete_import.py
===================================================================
--- trunk/blender/release/scripts/modules/console/complete_import.py 2013-03-28 18:04:07 UTC (rev 55651)
+++ trunk/blender/release/scripts/modules/console/complete_import.py 2013-03-28 19:33:14 UTC (rev 55652)
@@ -111,10 +111,11 @@
else:
folder_list = []
#folder_list = glob.glob(os.path.join(path,'*'))
- folder_list = [p for p in folder_list \
- if os.path.exists(os.path.join(path, p, '__init__.py')) \
- or p[-3:] in {'.py', '.so'} \
- or p[-4:] in {'.pyc', '.pyo', '.pyd'}]
+ folder_list = [
+ p for p in folder_list
+ if (os.path.exists(os.path.join(path, p, '__init__.py')) or
+ p[-3:] in {'.py', '.so'} or
+ p[-4:] in {'.pyc', '.pyo', '.pyd'})]
folder_list = [os.path.basename(p).split('.')[0] for p in folder_list]
return folder_list
Modified: trunk/blender/release/scripts/startup/bl_operators/node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/node.py 2013-03-28 18:04:07 UTC (rev 55651)
+++ trunk/blender/release/scripts/startup/bl_operators/node.py 2013-03-28 19:33:14 UTC (rev 55652)
@@ -127,7 +127,8 @@
tree_idname = context.space_data.edit_tree.bl_idname
for group in bpy.data.node_groups:
if group.bl_idname == tree_idname:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list