[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40027] trunk/blender: fix for misc py errors + some pep8 edits.
Campbell Barton
ideasman42 at gmail.com
Thu Sep 8 07:42:45 CEST 2011
Revision: 40027
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40027
Author: campbellbarton
Date: 2011-09-08 05:42:44 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
fix for misc py errors + some pep8 edits.
Modified Paths:
--------------
trunk/blender/doc/python_api/examples/bge.texture.1.py
trunk/blender/doc/python_api/examples/bpy.types.Operator.py
trunk/blender/intern/tools/credits_svn_gen.py
trunk/blender/intern/tools/pydna.py
trunk/blender/release/scripts/startup/bl_operators/animsys_update.py
trunk/blender/release/scripts/startup/bl_operators/nla.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py
trunk/blender/release/scripts/startup/bl_ui/properties_game.py
Modified: trunk/blender/doc/python_api/examples/bge.texture.1.py
===================================================================
--- trunk/blender/doc/python_api/examples/bge.texture.1.py 2011-09-08 04:45:39 UTC (rev 40026)
+++ trunk/blender/doc/python_api/examples/bge.texture.1.py 2011-09-08 05:42:44 UTC (rev 40027)
@@ -14,7 +14,7 @@
object = cont.owner
# get the reference pointer (ID) of the internal texture
- ID = texture.materialID(obj, 'IMoriginal.png')
+ ID = texture.materialID(object, 'IMoriginal.png')
# create a texture object
object_texture = texture.Texture(object, ID)
Modified: trunk/blender/doc/python_api/examples/bpy.types.Operator.py
===================================================================
--- trunk/blender/doc/python_api/examples/bpy.types.Operator.py 2011-09-08 04:45:39 UTC (rev 40026)
+++ trunk/blender/doc/python_api/examples/bpy.types.Operator.py 2011-09-08 05:42:44 UTC (rev 40027)
@@ -21,7 +21,7 @@
print("Hello World")
return {'FINISHED'}
-bpy.utils.register_class(SimpleOperator)
+bpy.utils.register_class(HelloWorldOperator)
# test call to the newly defined operator
bpy.ops.wm.hello_world()
Modified: trunk/blender/intern/tools/credits_svn_gen.py
===================================================================
--- trunk/blender/intern/tools/credits_svn_gen.py 2011-09-08 04:45:39 UTC (rev 40026)
+++ trunk/blender/intern/tools/credits_svn_gen.py 2011-09-08 05:42:44 UTC (rev 40027)
@@ -48,6 +48,7 @@
# -----------------------------------------------------------------------------
# Generic Class and parsing code, could be useful for all sorts of cases
+
class SvnCommit(object):
"""Just data store really"""
__slots__ = ("revision",
@@ -301,7 +302,7 @@
if (w[0].isdigit() or
(len(w) > 2 and w[0] == "[" and w[1] == "#") or
(len(w) > 1 and w[0] == "#")):
-
+
try:
num = int(w.strip("[]#"))
except ValueError:
@@ -365,32 +366,32 @@
for action, path in commit.paths:
if is_path_valid(path):
tot_valid += 1
-
+
if tot_valid == 0:
return False
-
+
# couldnt prove invalid, must be valid
return True
def main():
patch_map = build_patch_name_map(tracker_csv)
-
+
commits = parse_commits(svn_log)
credits = {key: Credit() for key in author_name_mapping}
- S = set()
+
for commit in commits:
if is_credit_commit_valid(commit):
patch_id, patch_author = patch_find_author(commit, patch_map)
-
+
if patch_author is None:
# will error out if we miss adding new devs
credit = credits[commit.author]
else:
# so we dont use again
del patch_map[patch_id]
-
+
unix_name = author_name_mapping_reverse.get(patch_author)
if unix_name is None: # not someone who contributed before
author_name_mapping_reverse[patch_author] = patch_author
Modified: trunk/blender/intern/tools/pydna.py
===================================================================
--- trunk/blender/intern/tools/pydna.py 2011-09-08 04:45:39 UTC (rev 40026)
+++ trunk/blender/intern/tools/pydna.py 2011-09-08 05:42:44 UTC (rev 40027)
@@ -257,7 +257,7 @@
struct_dict[b'ListBase'].ITER = list_base_iter
def CAST(self, to):
- if type(type_name) == str:
+ if type(to) == str:
type_cast = struct_dict[to.encode('ASCII')]
else:
type_cast = to
Modified: trunk/blender/release/scripts/startup/bl_operators/animsys_update.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/animsys_update.py 2011-09-08 04:45:39 UTC (rev 40026)
+++ trunk/blender/release/scripts/startup/bl_operators/animsys_update.py 2011-09-08 05:42:44 UTC (rev 40027)
@@ -685,7 +685,6 @@
]
-import bpy
from bpy.types import Operator
Modified: trunk/blender/release/scripts/startup/bl_operators/nla.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/nla.py 2011-09-08 04:45:39 UTC (rev 40026)
+++ trunk/blender/release/scripts/startup/bl_operators/nla.py 2011-09-08 05:42:44 UTC (rev 40027)
@@ -271,7 +271,8 @@
class ClearUselessActions(Operator):
- '''Mark actions with no F-Curves for deletion after save+reload of file preserving "action libraries"'''
+ '''Mark actions with no F-Curves for deletion after save+reload of ''' \
+ '''file preserving "action libraries"'''
bl_idname = "anim.clear_useless_actions"
bl_label = "Clear Useless Actions"
bl_options = {'REGISTER', 'UNDO'}
@@ -292,12 +293,14 @@
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.)
+ # if it has F-Curves, then it's a "action library"
+ # (i.e. walk, wave, jump, etc.)
# and should be left alone as that's what fake users are for!
if not action.fcurves:
# mark action for deletion
action.user_clear()
removed += 1
- self.report({'INFO'}, "Removed %d empty and/or fake-user only Actions" % (removed))
+ self.report({'INFO'}, "Removed %d empty and/or fake-user only Actions"
+ % removed)
return {'FINISHED'}
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py 2011-09-08 04:45:39 UTC (rev 40026)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py 2011-09-08 05:42:44 UTC (rev 40027)
@@ -74,6 +74,7 @@
if context.scene.render.engine == "BLENDER_GAME":
layout.row().prop(arm, "vert_deformer", expand=True)
+
class DATA_PT_display(ArmatureButtonsPanel, Panel):
bl_label = "Display"
@@ -185,11 +186,10 @@
layout.template_ID(ob, "pose_library", new="poselib.new", unlink="poselib.unlink")
if poselib:
-
- # list of poses in pose library
+ # list of poses in pose library
row = layout.row()
row.template_list(poselib, "pose_markers", poselib.pose_markers, "active_index", rows=5)
-
+
# column of operators for active pose
# - goes beside list
col = row.column(align=True)
@@ -206,9 +206,9 @@
if pose_marker_active is not None:
col.operator("poselib.pose_remove", icon='ZOOMOUT', text="").pose = pose_marker_active.name
col.operator("poselib.apply_pose", icon='ZOOM_SELECTED', text="").pose_index = poselib.pose_markers.active_index
-
- col.operator("poselib.action_sanitise", icon='HELP', text="") # XXX: put in menu?
-
+
+ col.operator("poselib.action_sanitise", icon='HELP', text="") # XXX: put in menu?
+
# properties for active marker
if pose_marker_active is not None:
layout.prop(pose_marker_active, "name")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py 2011-09-08 04:45:39 UTC (rev 40026)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py 2011-09-08 05:42:44 UTC (rev 40027)
@@ -81,7 +81,7 @@
speaker = context.speaker
split = layout.split()
-
+
col = split.column()
col.label("Volume:")
col.prop(speaker, "volume_min", text="Minimum")
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_game.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_game.py 2011-09-08 04:45:39 UTC (rev 40026)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_game.py 2011-09-08 05:42:44 UTC (rev 40027)
@@ -344,7 +344,7 @@
row = col.row()
row.prop(gs, "use_frame_rate")
row.prop(gs, "use_display_lists")
-
+
col.prop(gs, "restrict_animation_updates")
More information about the Bf-blender-cvs
mailing list