[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57803] trunk/blender/release/scripts: pep8 cleanup
Campbell Barton
ideasman42 at gmail.com
Thu Jun 27 05:05:22 CEST 2013
Revision: 57803
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57803
Author: campbellbarton
Date: 2013-06-27 03:05:19 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
pep8 cleanup
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/modules/console/complete_namespace.py
trunk/blender/release/scripts/modules/nodeitems_utils.py
trunk/blender/release/scripts/startup/bl_operators/anim.py
trunk/blender/release/scripts/startup/bl_operators/node.py
trunk/blender/release/scripts/startup/bl_operators/presets.py
trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
trunk/blender/release/scripts/startup/bl_operators/view3d.py
trunk/blender/release/scripts/startup/bl_operators/wm.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/release/scripts/startup/bl_ui/properties_freestyle.py
trunk/blender/release/scripts/startup/bl_ui/properties_game.py
trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.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_image.py
trunk/blender/release/scripts/startup/bl_ui/space_node.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
trunk/blender/release/scripts/startup/nodeitems_builtins.py
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py 2013-06-27 01:10:19 UTC (rev 57802)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py 2013-06-27 03:05:19 UTC (rev 57803)
@@ -35,6 +35,7 @@
FORBIDDEN: "Explicitly forbidden!",
}
+
def gen_menu_file(stats, settings):
# Generate languages file used by Blender's i18n system.
# First, match all entries in LANGUAGES to a lang in stats, if possible!
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2013-06-27 01:10:19 UTC (rev 57802)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2013-06-27 03:05:19 UTC (rev 57803)
@@ -507,7 +507,8 @@
report({'ERROR'}, error_msg)
print(error_msg)
- kc_new = next(chain(iter(kc for kc in keyconfigs if kc not in keyconfigs_old), (None,)))
+ kc_new = next(chain(iter(kc for kc in keyconfigs
+ if kc not in keyconfigs_old), (None,)))
if kc_new is None:
if report is not None:
report({'ERROR'}, "Failed to load keymap %r" % filepath)
Modified: trunk/blender/release/scripts/modules/console/complete_namespace.py
===================================================================
--- trunk/blender/release/scripts/modules/console/complete_namespace.py 2013-06-27 01:10:19 UTC (rev 57802)
+++ trunk/blender/release/scripts/modules/console/complete_namespace.py 2013-06-27 03:05:19 UTC (rev 57803)
@@ -110,7 +110,7 @@
# dictionary type
matches = ['%s[%r]' % (base, key) for key in sorted(obj.keys())]
else:
- # list type,
+ # list type
matches = ['%s[%d]' % (base, idx) for idx in range(obj_len)]
if word != base:
matches = [match for match in matches if match.startswith(word)]
Modified: trunk/blender/release/scripts/modules/nodeitems_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/nodeitems_utils.py 2013-06-27 01:10:19 UTC (rev 57802)
+++ trunk/blender/release/scripts/modules/nodeitems_utils.py 2013-06-27 03:05:19 UTC (rev 57803)
@@ -42,6 +42,7 @@
yield item
self.items = items_gen
+
class NodeItem():
def __init__(self, nodetype, label=None, settings={}, poll=None):
self.nodetype = nodetype
@@ -81,6 +82,7 @@
_node_categories = {}
+
def register_node_categories(identifier, cat_list):
if identifier in _node_categories:
raise KeyError("Node categories list '%s' already registered" % identifier)
@@ -97,21 +99,21 @@
menu_types = []
panel_types = []
for cat in cat_list:
- menu_type = type("NODE_MT_category_"+cat.identifier, (bpy.types.Menu,), {
- "bl_space_type" : 'NODE_EDITOR',
- "bl_label" : cat.name,
- "category" : cat,
- "poll" : cat.poll,
- "draw" : draw_node_item,
+ menu_type = type("NODE_MT_category_" + cat.identifier, (bpy.types.Menu,), {
+ "bl_space_type": 'NODE_EDITOR',
+ "bl_label": cat.name,
+ "category": cat,
+ "poll": cat.poll,
+ "draw": draw_node_item,
})
- panel_type = type("NODE_PT_category_"+cat.identifier, (bpy.types.Panel,), {
- "bl_space_type" : 'NODE_EDITOR',
- "bl_region_type" : 'TOOLS',
- "bl_label" : cat.name,
- "bl_options" : {'DEFAULT_CLOSED'},
- "category" : cat,
- "poll" : cat.poll,
- "draw" : draw_node_item,
+ panel_type = type("NODE_PT_category_" + cat.identifier, (bpy.types.Panel,), {
+ "bl_space_type": 'NODE_EDITOR',
+ "bl_region_type": 'TOOLS',
+ "bl_label": cat.name,
+ "bl_options": {'DEFAULT_CLOSED'},
+ "category": cat,
+ "poll": cat.poll,
+ "draw": draw_node_item,
})
menu_types.append(menu_type)
@@ -166,4 +168,3 @@
for cat_types in _node_categories.values():
unregister_node_cat_types(cat_types)
_node_categories.clear()
-
Modified: trunk/blender/release/scripts/startup/bl_operators/anim.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/anim.py 2013-06-27 01:10:19 UTC (rev 57802)
+++ trunk/blender/release/scripts/startup/bl_operators/anim.py 2013-06-27 03:05:19 UTC (rev 57803)
@@ -261,8 +261,8 @@
for action in bpy.data.actions:
# if only user is "fake" user...
- if ((self.only_unused is False) or
- (action.use_fake_user and action.users == 1)):
+ if ((self.only_unused is False) or
+ (action.use_fake_user and action.users == 1)):
# if it has F-Curves, then it's a "action library"
# (i.e. walk, wave, jump, etc.)
Modified: trunk/blender/release/scripts/startup/bl_operators/node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/node.py 2013-06-27 01:10:19 UTC (rev 57802)
+++ trunk/blender/release/scripts/startup/bl_operators/node.py 2013-06-27 03:05:19 UTC (rev 57803)
@@ -18,9 +18,17 @@
# <pep8-80 compliant>
-import bpy, nodeitems_utils
-from bpy.types import Operator, PropertyGroup
-from bpy.props import BoolProperty, CollectionProperty, EnumProperty, IntProperty, StringProperty
+import bpy
+import nodeitems_utils
+from bpy.types import (Operator,
+ PropertyGroup,
+ )
+from bpy.props import (BoolProperty,
+ CollectionProperty,
+ EnumProperty,
+ IntProperty,
+ StringProperty,
+ )
class NodeSetting(PropertyGroup):
@@ -30,6 +38,7 @@
default="",
)
+
# Base class for node 'Add' operators
class NodeAddOperator():
@@ -80,12 +89,12 @@
for setting in self.settings:
# XXX catch exceptions here?
value = eval(setting.value)
-
+
try:
setattr(node, setting.name, value)
except AttributeError as e:
- self.report({'ERROR_INVALID_INPUT'}, "Node has no attribute "+setting.name)
- print (str(e))
+ self.report({'ERROR_INVALID_INPUT'}, "Node has no attribute " + setting.name)
+ print(str(e))
# Continue despite invalid attribute
if space.use_hidden_preview:
@@ -198,7 +207,7 @@
# no need to keep
self._enum_item_hack.clear()
-
+
if item:
# apply settings from the node item
for setting in item.settings.items():
Modified: trunk/blender/release/scripts/startup/bl_operators/presets.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/presets.py 2013-06-27 01:10:19 UTC (rev 57802)
+++ trunk/blender/release/scripts/startup/bl_operators/presets.py 2013-06-27 03:05:19 UTC (rev 57803)
@@ -30,8 +30,10 @@
- preset_subdir """
# bl_idname = "script.preset_base_add"
# bl_label = "Add a Python Preset"
- bl_options = {'REGISTER', 'INTERNAL'} # only because invoke_props_popup requires. Also do not add to search menu.
+ # only because invoke_props_popup requires. Also do not add to search menu.
+ bl_options = {'REGISTER', 'INTERNAL'}
+
name = StringProperty(
name="Name",
description="Name of the preset, used to make the path name",
Modified: trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py 2013-06-27 01:10:19 UTC (rev 57802)
+++ trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py 2013-06-27 03:05:19 UTC (rev 57803)
@@ -23,6 +23,7 @@
# Contributor(s): Keith "Wahooney" Boshoff, Campbell Barton
+
def applyVertexDirt(me, blur_iterations, blur_strength, clamp_dirt, clamp_clean, dirt_only):
from mathutils import Vector
from math import acos
Modified: trunk/blender/release/scripts/startup/bl_operators/view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/view3d.py 2013-06-27 01:10:19 UTC (rev 57802)
+++ trunk/blender/release/scripts/startup/bl_operators/view3d.py 2013-06-27 03:05:19 UTC (rev 57803)
@@ -138,7 +138,7 @@
x = event.mouse_region_x
y = event.mouse_region_y
- if self.extend == False and self.toggle == False and self.deselect == False:
+ if self.extend is False and self.toggle is False and self.deselect is False:
active_object = context.active_object
if active_object:
Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py 2013-06-27 01:10:19 UTC (rev 57802)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py 2013-06-27 03:05:19 UTC (rev 57803)
@@ -1180,6 +1180,7 @@
else:
return {'CANCELLED'}
+
class WM_OT_appconfig_default(Operator):
bl_idname = "wm.appconfig_default"
bl_label = "Default Application Configuration"
@@ -1574,8 +1575,9 @@
def execute(self, context):
import addon_utils
-
+
err_str = ""
+
def err_cb():
import traceback
nonlocal err_str
@@ -1618,6 +1620,7 @@
import addon_utils
err_str = ""
+
def err_cb():
import traceback
nonlocal err_str
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py 2013-06-27 01:10:19 UTC (rev 57802)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list