[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53829] trunk/blender/release/scripts: style cleanup
Campbell Barton
ideasman42 at gmail.com
Wed Jan 16 00:15:33 CET 2013
Revision: 53829
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53829
Author: campbellbarton
Date: 2013-01-15 23:15:32 +0000 (Tue, 15 Jan 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/release/scripts/modules/addon_utils.py
trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
trunk/blender/release/scripts/modules/bpy/path.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/modules/bpy_extras/io_utils.py
trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
trunk/blender/release/scripts/modules/bpy_extras/object_utils.py
trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py
trunk/blender/release/scripts/modules/bpy_restrict_state.py
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/startup/bl_operators/node.py
trunk/blender/release/scripts/startup/bl_operators/object.py
trunk/blender/release/scripts/startup/bl_operators/presets.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_follow_active.py
trunk/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.py
trunk/blender/release/scripts/startup/bl_operators/wm.py
trunk/blender/release/scripts/startup/bl_ui/__init__.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/release/scripts/startup/bl_ui/properties_game.py
trunk/blender/release/scripts/startup/bl_ui/properties_mask_common.py
trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
trunk/blender/release/scripts/startup/bl_ui/properties_render.py
trunk/blender/release/scripts/startup/bl_ui/space_clip.py
trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
trunk/blender/release/scripts/startup/bl_ui/space_info.py
trunk/blender/release/scripts/startup/bl_ui/space_text.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
Modified: trunk/blender/release/scripts/modules/addon_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/addon_utils.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/modules/addon_utils.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -208,9 +208,9 @@
if loaded_state is Ellipsis:
print("Warning: addon-module %r found module "
- "but without __addon_enabled__ field, "
- "possible name collision from file: %r" %
- (module_name, getattr(mod, "__file__", "<unknown>")))
+ "but without __addon_enabled__ field, "
+ "possible name collision from file: %r" %
+ (module_name, getattr(mod, "__file__", "<unknown>")))
loaded_state = False
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/spell_check_utils.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -37,7 +37,7 @@
"aren", # aren't
"betweens", # yuck! in-betweens!
"boolean", "booleans",
- "couldn", #couldn't
+ "couldn", # couldn't
"decrement",
"derivate",
"doesn", # doesn't
Modified: trunk/blender/release/scripts/modules/bpy/path.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/path.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/modules/bpy/path.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -47,6 +47,7 @@
extensions_image,
)
+
def abspath(path, start=None, library=None):
"""
Returns the absolute path relative to the current blend file
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -237,7 +237,8 @@
_addon_utils.reset_all(reload_scripts)
# run the active integration preset
- filepath = preset_find(_user_preferences.inputs.active_keyconfig, "keyconfig")
+ filepath = preset_find(_user_preferences.inputs.active_keyconfig,
+ "keyconfig")
if filepath:
keyconfig_set(filepath)
Modified: trunk/blender/release/scripts/modules/bpy_extras/io_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/io_utils.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/modules/bpy_extras/io_utils.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -341,7 +341,7 @@
('COPY', "Copy", "Copy the file to the destination path "
"(or subdirectory)"),
),
- default='AUTO'
+ default='AUTO',
)
@@ -480,10 +480,10 @@
while name_new in name_dict_values:
count_str = "%03d" % count
name_new = "%.*s%s%s" % (name_max - (len(count_str) + 1),
- name_new_orig,
- sep,
- count_str,
- )
+ name_new_orig,
+ sep,
+ count_str,
+ )
count += 1
name_dict[key] = name_new
Modified: trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/modules/bpy_extras/mesh_utils.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -247,7 +247,7 @@
break
i = ed_adj.index(context_loop[-2])
- context_loop.append(ed_adj[not i])
+ context_loop.append(ed_adj[not i])
# Dont look at this again
del ed_adj[:]
@@ -530,12 +530,12 @@
tris.append((verts[fv[0]].co,
verts[fv[1]].co,
verts[fv[2]].co,
- ))
+ ))
if len(fv) == 4:
tris.append((verts[fv[0]].co,
verts[fv[3]].co,
verts[fv[2]].co,
- ))
+ ))
tri_faces.append(tris)
# For each face, generate the required number of random points
Modified: trunk/blender/release/scripts/modules/bpy_extras/object_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/object_utils.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/modules/bpy_extras/object_utils.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -123,7 +123,7 @@
base.layers[scene.active_layer] = True
else:
base.layers = [True if i == scene.active_layer
- else False for i in range(len(scene.layers))]
+ else False for i in range(len(scene.layers))]
if v3d:
base.layers_from_view(context.space_data)
Modified: trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -50,7 +50,7 @@
out = Vector(((2.0 * coord[0] / region.width) - 1.0,
(2.0 * coord[1] / region.height) - 1.0,
-0.5
- ))
+ ))
w = out.dot(persinv[3].xyz) + persinv[3][3]
@@ -89,7 +89,7 @@
persinv = persmat.inverted()
origin_start = ((persinv.col[0].xyz * dx) +
(persinv.col[1].xyz * dy) +
- viewinv.translation)
+ viewinv.translation)
return origin_start
Modified: trunk/blender/release/scripts/modules/bpy_restrict_state.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_restrict_state.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/modules/bpy_restrict_state.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -28,14 +28,17 @@
import bpy as _bpy
+
class _RestrictContext():
__slots__ = ()
_real_data = _bpy.data
# safe, the pointer never changes
_real_pref = _bpy.context.user_preferences
+
@property
def window_manager(self):
return self._real_data.window_managers[0]
+
@property
def user_preferences(self):
return self._real_pref
@@ -51,6 +54,7 @@
class RestrictBlend():
__slots__ = ("context", "data")
+
def __enter__(self):
self.data = _bpy.data
self.context = _bpy.context
Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/modules/bpy_types.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -484,13 +484,16 @@
if cont.type == 'PYTHON']
)
+
class NodeSocket(StructRNA): # , metaclass=RNAMeta
__slots__ = ()
@property
def links(self):
"""List of node links from or to this socket"""
- return tuple(link for link in self.id_data.links if link.from_socket == self or link.to_socket == self)
+ return tuple(link for link in self.id_data.links
+ if (link.from_socket == self or
+ link.to_socket == self))
# values are module: [(cls, path, line), ...]
Modified: trunk/blender/release/scripts/startup/bl_operators/node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/node.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/startup/bl_operators/node.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -22,6 +22,7 @@
from bpy.types import Operator
from bpy.props import BoolProperty, EnumProperty, StringProperty
+
# Base class for node 'Add' operators
class NodeAddOperator():
@staticmethod
@@ -78,8 +79,9 @@
use_transform = BoolProperty(
name="Use Transform",
description="Start transform operator after inserting the node",
- default = False,
+ default=False,
)
+
def execute(self, context):
node = self.create_node(context, self.type)
Modified: trunk/blender/release/scripts/startup/bl_operators/object.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/object.py 2013-01-15 22:26:46 UTC (rev 53828)
+++ trunk/blender/release/scripts/startup/bl_operators/object.py 2013-01-15 23:15:32 UTC (rev 53829)
@@ -111,10 +111,10 @@
bl_options = {'REGISTER', 'UNDO'}
extend = BoolProperty(
- name="Extend",
- description="Extend the selection",
- default=False
- )
+ name="Extend",
+ description="Extend the selection",
+ default=False
+ )
def execute(self, context):
scene = context.scene
@@ -305,8 +305,8 @@
('RELATIVE_EDGE',
"Relative Edge",
"Calculate relative position (using edges)",
+ ),
),
- ),
name="Transformation Mode",
description="Relative shape positions to the new shape method",
default='OFFSET',
@@ -682,7 +682,7 @@
"scale" : "delta_scale"
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list