[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25146] trunk/blender: pep8 edits and fix some warnings

Campbell Barton ideasman42 at gmail.com
Sat Dec 5 23:03:10 CET 2009


Revision: 25146
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25146
Author:   campbellbarton
Date:     2009-12-05 23:03:07 +0100 (Sat, 05 Dec 2009)

Log Message:
-----------
pep8 edits and fix some warnings

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy/__init__.py
    trunk/blender/release/scripts/modules/bpy/ops.py
    trunk/blender/release/scripts/modules/bpy/utils.py
    trunk/blender/release/scripts/modules/bpy_types.py
    trunk/blender/release/scripts/modules/dynamic_menu.py
    trunk/blender/release/scripts/modules/graphviz_export.py
    trunk/blender/release/scripts/modules/retopo.py
    trunk/blender/release/scripts/modules/rigify/__init__.py
    trunk/blender/release/scripts/modules/rigify/arm.py
    trunk/blender/release/scripts/modules/rigify/delta.py
    trunk/blender/release/scripts/modules/rigify/finger.py
    trunk/blender/release/scripts/modules/rigify/leg.py
    trunk/blender/release/scripts/modules/rigify/neck.py
    trunk/blender/release/scripts/modules/rigify/palm.py
    trunk/blender/release/scripts/modules/rigify/spine.py
    trunk/blender/release/scripts/modules/rna_prop_ui.py
    trunk/blender/release/scripts/op/object.py
    trunk/blender/source/blender/editors/space_graph/graph_edit.c

Modified: trunk/blender/release/scripts/modules/bpy/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/__init__.py	2009-12-05 21:54:46 UTC (rev 25145)
+++ trunk/blender/release/scripts/modules/bpy/__init__.py	2009-12-05 22:03:07 UTC (rev 25146)
@@ -16,6 +16,8 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+# <pep8 compliant>
+
 # internal blender C module
 import _bpy
 from _bpy import types, props
@@ -38,8 +40,8 @@
     import os
     import traceback
     import time
-    
-    
+
+
     t_main = time.time()
 
     def test_import(module_name):
@@ -52,8 +54,8 @@
         except:
             traceback.print_exc()
             return None
-        
 
+
     for base_path in utils.script_paths():
         for path_subdir in ("ui", "op", "io"):
             path = os.path.join(base_path, path_subdir)

Modified: trunk/blender/release/scripts/modules/bpy/ops.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/ops.py	2009-12-05 21:54:46 UTC (rev 25145)
+++ trunk/blender/release/scripts/modules/bpy/ops.py	2009-12-05 22:03:07 UTC (rev 25146)
@@ -59,7 +59,7 @@
 
     def add(self, pyop):
         op_add(pyop)
-    
+
     def add_macro(self, pyop):
         op_add_macro(pyop)
 

Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py	2009-12-05 21:54:46 UTC (rev 25145)
+++ trunk/blender/release/scripts/modules/bpy/utils.py	2009-12-05 22:03:07 UTC (rev 25146)
@@ -16,6 +16,8 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+# <pep8 compliant>
+
 import bpy
 import os
 
@@ -58,7 +60,7 @@
 
 def script_paths(*args):
     scripts = list(_scripts)
-    
+
     # add user scripts dir
     user_script_path = bpy.context.user_preferences.filepaths.python_scripts_directory
 
@@ -84,11 +86,11 @@
     return script_paths
 
 
-_presets = os.path.join(_scripts[0], "presets") # FIXME - multiple paths 
+_presets = os.path.join(_scripts[0], "presets") # FIXME - multiple paths
 
 def preset_paths(subdir):
-	'''
-	Returns a list of paths for a spesific preset.
-	'''
-	
-	return (os.path.join(_presets, subdir), )
+    '''
+    Returns a list of paths for a spesific preset.
+    '''
+
+    return (os.path.join(_presets, subdir), )

Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py	2009-12-05 21:54:46 UTC (rev 25145)
+++ trunk/blender/release/scripts/modules/bpy_types.py	2009-12-05 22:03:07 UTC (rev 25146)
@@ -15,6 +15,9 @@
 #  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
 from _bpy import types as bpy_types
 
 StructRNA = bpy_types.Struct.__bases__[0]
@@ -57,7 +60,7 @@
         '''
         # use the name so different types can be tested.
         name = parent_test.name
-        
+
         parent = self.parent
         i = 1
         while parent:
@@ -65,7 +68,7 @@
                 return i
             parent = parent.parent
             i += 1
-        
+
         return 0
 
     @property
@@ -76,19 +79,19 @@
     def parent_recursive(self):
         parent_list = []
         parent = self.parent
-        
+
         while parent:
             if parent:
                 parent_list.append(parent)
-            
+
             parent = parent.parent
-        
+
         return parent_list
 
     @property
     def length(self):
         return (self.head - self.tail).length
-    
+
     @length.setter
     def length(self, value):
         """The distance from head to tail"""
@@ -105,7 +108,7 @@
             index = bone.parent_index(self)
             if index:
                 bones_children.append((index, bone))
-        
+
         # sort by distance to parent
         bones_children.sort(key=lambda bone_pair: bone_pair[0])
         return [bone for index, bone in bones_children]
@@ -136,21 +139,21 @@
                     print("multiple basenames found, this is probably not what you want!", bone.name, children_basename)
 
                 break
-        
+
         return chain
 
     @property
     def _other_bones(self):
         id_data = self.id_data
         id_data_type = type(id_data)
-        
+
         if id_data_type == bpy_types.Object:
             bones = id_data.pose.bones
         elif id_data_type == bpy_types.Armature:
             bones = id_data.edit_bones
             if not bones: # not in editmode
                 bones = id_data.bones
-        
+
         return bones
 
 
@@ -166,34 +169,36 @@
     pass
 
 
-def ord_ind(i1,i2):
-    if i1<i2: return i1,i2
-    return i2,i1
+def ord_ind(i1, i2):
+    if i1 < i2:
+        return i1, i2
+    return i2, i1
 
+
 class Mesh(bpy_types.ID):
-    
+
     def from_pydata(self, verts, edges, faces):
         '''
         Make a mesh from a list of verts/edges/faces
         Until we have a nicer way to make geometry, use this.
         '''
         self.add_geometry(len(verts), len(edges), len(faces))
-        
+
         verts_flat = [f for v in verts for f in v]
         self.verts.foreach_set("co", verts_flat)
         del verts_flat
-        
+
         edges_flat = [i for e in edges for i in e]
         self.edges.foreach_set("verts", edges_flat)
         del edges_flat
-        
+
         def treat_face(f):
             if len(f) == 3:
                 return f[0], f[1], f[2], 0
             elif f[3] == 0:
                 return f[3], f[0], f[1], f[2]
             return f
-        
+
         faces_flat = [v for f in faces for v in treat_face(f)]
         self.faces.foreach_set("verts_raw", faces_flat)
         del faces_flat
@@ -233,17 +238,21 @@
     @property
     def edge_keys(self):
         verts = tuple(self.verts)
-        if len(verts)==3:
-            return ord_ind(verts[0], verts[1]),  ord_ind(verts[1], verts[2]),  ord_ind(verts[2], verts[0])
+        if len(verts) == 3:
+            return ord_ind(verts[0], verts[1]), ord_ind(verts[1], verts[2]), ord_ind(verts[2], verts[0])
 
-        return ord_ind(verts[0], verts[1]),  ord_ind(verts[1], verts[2]),  ord_ind(verts[2], verts[3]),  ord_ind(verts[3], verts[0])
+        return ord_ind(verts[0], verts[1]), ord_ind(verts[1], verts[2]), ord_ind(verts[2], verts[3]), ord_ind(verts[3], verts[0])
 
 
 import collections
+
+
 class OrderedMeta(type):
+
     def __init__(cls, name, bases, attributes):
         super(OrderedMeta, cls).__init__(name, bases, attributes)
         cls.order = list(attributes.keys())
+
     def __prepare__(name, bases, **kwargs):
         return collections.OrderedDict()
 
@@ -252,32 +261,35 @@
 class Operator(StructRNA, metaclass=OrderedMeta):
     pass
 
+
 class Macro(StructRNA, metaclass=OrderedMeta):
     # bpy_types is imported before ops is defined
     # so we have to do a local import on each run
+
     @classmethod
     def define(self, opname):
         from _bpy import ops
         return ops.macro_define(self, opname)
 
+
 class Menu(StructRNA):
-    
+
     def path_menu(self, searchpaths, operator):
         layout = self.layout
         # hard coded to set the operators 'path' to the filename.
-        
+
         import os
 
         def path_to_name(f):
             ''' Only capitalize all lowercase names, mixed case use them as is.
             '''
             f_base = os.path.splitext(f)[0]
-            
+
             # string replacements
             f_base = f_base.replace("_colon_", ":")
-            
+
             f_base = f_base.replace("_", " ")
-            
+
             if f_base.lower() == f_base:
                 return ' '.join([w[0].upper() + w[1:] for w in f_base.split()])
             else:
@@ -298,7 +310,7 @@
                 continue
 
             layout.operator(operator, text=path_to_name(f)).path = path
-    
+
     def draw_preset(self, context):
         '''Define these on the subclass
          - preset_operator

Modified: trunk/blender/release/scripts/modules/dynamic_menu.py
===================================================================
--- trunk/blender/release/scripts/modules/dynamic_menu.py	2009-12-05 21:54:46 UTC (rev 25145)
+++ trunk/blender/release/scripts/modules/dynamic_menu.py	2009-12-05 22:03:07 UTC (rev 25146)
@@ -16,8 +16,11 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+# <pep8 compliant>
+
 import bpy
 
+
 def collect_baseclasses(_class, bases):
 
     if _class is type or _class is object:
@@ -29,6 +32,7 @@
 
     return bases
 
+
 def collect_subclasses(_class, subs):
 
     if _class is type or _class is object:
@@ -40,6 +44,7 @@
 
     return subs
 
+
 class DynMenu(bpy.types.Menu):
 
     def draw(self, context):
@@ -61,6 +66,7 @@
             subclass.internal_draw(self, context)
             # print("subclass.internal_draw", subclass.internal_draw)
 
+
 def setup(menu_class):
     '''
     Setup subclasses (not needed when self.add() is used)
@@ -88,6 +94,7 @@
 
     root_class.draw = DynMenu.draw
 
+
 def add(menu_class, func):
     '''
     Add a single function directly without having to make a class

Modified: trunk/blender/release/scripts/modules/graphviz_export.py
===================================================================
--- trunk/blender/release/scripts/modules/graphviz_export.py	2009-12-05 21:54:46 UTC (rev 25145)
+++ trunk/blender/release/scripts/modules/graphviz_export.py	2009-12-05 22:03:07 UTC (rev 25146)
@@ -16,6 +16,8 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
+# <pep8 compliant>
+
 import bpy
 
 header = '''
@@ -28,6 +30,7 @@
 }
 '''
 
+
 def compat_str(text, line_length=0):
 
     if line_length:
@@ -35,28 +38,29 @@
         while len(text) > line_length:
             text_ls.append(text[:line_length])
             text = text[line_length:]
-        
+
         if text:
             text_ls.append(text)
         text = '\n  '.join(text_ls)
-    
-    
+
+
     #text = text.replace('.', '.\n')
     #text = text.replace(']', ']\n')
     text = text.replace("\n", "\\n")
     text = text.replace('"', '\\"')
     return "* " + text
 
+
 def graph_armature(obj, path, FAKE_PARENT=True, CONSTRAINTS=True, DRIVERS=True, XTRA_INFO=False):
     CONSTRAINTS = DRIVERS = True
-    
-    file = open(path, "w")
-    fw = file.write
+
+    fileobject = open(path, "w")
+    fw = fileobject.write
     fw(header)
     fw('label = "%s::%s" ;' % (bpy.data.filename.split("/")[-1].split("\\")[-1], obj.name))
-    
+
     arm = obj.data
-    
+

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list