pep8 compliance

17 files changed, 27 insertions, 21 deletions

diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index b4d69a289ee..fd712f1b832 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -74,6 +74,7 @@ def svn_step(branch=''):
     else:
         return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
 
+
 def lib_svn_step(dir):
     return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
 
diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py
index 3e1dec726e5..ad7c09933c6 100644
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -64,10 +64,11 @@ def get_platform(filename):
 
     return '-'.join(platform_tokens)
 
+
 def get_branch(filename):
     tokens = filename.split("-")
     branch = ""
-    
+
     for token in tokens:
         if branch == "":
             branch = token
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index cdc7cff3275..4c19b723fc8 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -36,7 +36,7 @@ builder = sys.argv[1]
 branch = ''
 
 if len(sys.argv) >= 3:
-	branch = sys.argv[2]
+    branch = sys.argv[2]
 
 # scons does own packaging
 if builder.find('scons') != -1:
diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py
index 9a5e3553ea2..ebcc75ade2b 100755
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
@@ -32,7 +32,7 @@ IGNORE = (
     "/decimation/intern/future/",
     "/TerraplayNetwork/",
     "/ik_glut_test/",
-    
+
     # specific source files
     "extern/Eigen2/Eigen/src/Cholesky/CholeskyInstantiations.cpp",
     "extern/Eigen2/Eigen/src/Core/CoreInstantiations.cpp",
@@ -65,10 +65,7 @@ IGNORE = (
     "extern/eltopo/common/meshes/meshloader.h",
     "extern/eltopo/eltopo3d/broadphase_blenderbvh.h"
     )
-    
-    
 
-    
 
 import os
 from os.path import join, dirname, normpath, abspath, splitext
diff --git a/doc/python_api/examples/bpy.props.4.py b/doc/python_api/examples/bpy.props.4.py
index d44f8947cb4..2b44d94f72a 100644
--- a/doc/python_api/examples/bpy.props.4.py
+++ b/doc/python_api/examples/bpy.props.4.py
@@ -10,6 +10,7 @@ All properties define update functions except for CollectionProperty.
 
 import bpy
 
+
 def update_func(self, context):
     print("my test function", self)
 
diff --git a/release/scripts/modules/bpy_extras/image_utils.py b/release/scripts/modules/bpy_extras/image_utils.py
index f45f9c6f225..551940b26e2 100644
--- a/release/scripts/modules/bpy_extras/image_utils.py
+++ b/release/scripts/modules/bpy_extras/image_utils.py
@@ -22,6 +22,7 @@ __all__ = (
     "load_image",
 )
 
+
 # limited replacement for BPyImage.comprehensiveImageLoad
 def load_image(imagepath,
                dirname="",
diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py
index e026910fb43..2062fe4485f 100644
--- a/release/scripts/modules/bpy_extras/mesh_utils.py
+++ b/release/scripts/modules/bpy_extras/mesh_utils.py
@@ -27,6 +27,7 @@ __all__ = (
     "ngon_tesselate",
 )
 
+
 def mesh_linked_faces(mesh):
     """
     Splits the mesh into connected faces, use this for seperating cubes from
diff --git a/release/scripts/modules/bpy_extras/view3d_utils.py b/release/scripts/modules/bpy_extras/view3d_utils.py
index f2f2e53240b..01ac543aec7 100644
--- a/release/scripts/modules/bpy_extras/view3d_utils.py
+++ b/release/scripts/modules/bpy_extras/view3d_utils.py
@@ -25,6 +25,7 @@ __all__ = (
     "location_3d_to_region_2d",
 )
 
+
 def region_2d_to_vector_3d(region, rv3d, coord):
     """
     Return a direction vector from the viewport at the spesific 2d region
@@ -48,7 +49,7 @@ def region_2d_to_vector_3d(region, rv3d, coord):
         out = Vector(((2.0 * coord[0] / region.width) - 1.0,
                       (2.0 * coord[1] / region.height) - 1.0,
                       -0.5
-                    ))        
+                    ))
 
         w = (out[0] * persinv[0][3]) + \
             (out[1] * persinv[1][3]) + \
diff --git a/release/scripts/startup/bl_operators/nla.py b/release/scripts/startup/bl_operators/nla.py
index 7cbdaa3ddbf..469e9015e62 100644
--- a/release/scripts/startup/bl_operators/nla.py
+++ b/release/scripts/startup/bl_operators/nla.py
@@ -103,7 +103,7 @@ def bake(frame_start,
 
     # -------------------------------------------------------------------------
     # Collect transformations
-    
+
     # could speed this up by applying steps here too...
     for f in frame_range:
         scene.frame_set(f)
diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py
index 2ecca8ab168..a8bb3227b3c 100644
--- a/release/scripts/startup/bl_operators/object_quick_effects.py
+++ b/release/scripts/startup/bl_operators/object_quick_effects.py
@@ -244,6 +244,7 @@ class QuickExplode(bpy.types.Operator):
         self.frame_end = self.frame_start + self.frame_duration
         return self.execute(context)
 
+
 def obj_bb_minmax(obj, min_co, max_co):
     for i in range(0, 8):
         bb_vec = Vector(obj.bound_box[i]) * obj.matrix_world
diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
index 4f5b1d8b233..c70b9071985 100644
--- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py
+++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
@@ -16,7 +16,7 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-# <pep8 compliant>
+# TODO <pep8 compliant>
 
 from mathutils import Matrix, Vector, geometry
 import bpy
diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py
index cb26b093601..00d8d08852e 100644
--- a/release/scripts/startup/bl_ui/properties_data_curve.py
+++ b/release/scripts/startup/bl_ui/properties_data_curve.py
@@ -112,22 +112,23 @@ class DATA_PT_shape_curve(CurveButtonsPanel, bpy.types.Panel):
             sub.prop(curve, "use_fill_front")
             sub.prop(curve, "use_fill_back")
             col.prop(curve, "use_fill_deform", text="Fill Deformed")
-            
+
+
 class DATA_PT_curve_texture_space(CurveButtonsPanel, bpy.types.Panel):
     bl_label = "Texture Space"
     bl_options = {'DEFAULT_CLOSED'}
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-    
+
     def draw(self, context):
         layout = self.layout
-        
+
         ob = context.object
         curve = context.curve
 
         row = layout.row()
         row.prop(curve, "use_auto_texspace")
         row.prop(curve, "use_uv_as_generated")
-        
+
         row = layout.row()
         row.column().prop(curve, "texspace_location", text="Location")
         row.column().prop(curve, "texspace_size", text="Size")
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index e2c88413177..8c966825aee 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -118,6 +118,7 @@ class DATA_PT_texture_space(MeshButtonsPanel, bpy.types.Panel):
         row.column().prop(mesh, "texspace_location", text="Location")
         row.column().prop(mesh, "texspace_size", text="Size")
 
+
 class DATA_PT_vertex_groups(MeshButtonsPanel, bpy.types.Panel):
     bl_label = "Vertex Groups"
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
diff --git a/release/scripts/startup/bl_ui/properties_data_metaball.py b/release/scripts/startup/bl_ui/properties_data_metaball.py
index dad308c9058..6dda99bc37f 100644
--- a/release/scripts/startup/bl_ui/properties_data_metaball.py
+++ b/release/scripts/startup/bl_ui/properties_data_metaball.py
@@ -70,20 +70,20 @@ class DATA_PT_metaball(DataButtonsPanel, bpy.types.Panel):
 
         layout.label(text="Update:")
         layout.prop(mball, "update_method", expand=True)
-        
-        
+
+
 class DATA_PT_mball_texture_space(DataButtonsPanel, bpy.types.Panel):
     bl_label = "Texture Space"
     bl_options = {'DEFAULT_CLOSED'}
     COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-    
+
     def draw(self, context):
         layout = self.layout
 
         mball = context.meta_ball
 
         layout.prop(mball, "use_auto_texspace")
-        
+
         row = layout.row()
         row.column().prop(mball, "texspace_location", text="Location")
         row.column().prop(mball, "texspace_size", text="Size")
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index 586675f2ca0..ce6d0990f05 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -485,7 +485,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
 
         if md.wrap_method == 'PROJECT':
             split = layout.split(percentage=0.25)
-            
+
             col = split.column()
             col.label(text="Axis:")
             col.prop(md, "use_project_x")
diff --git a/release/scripts/startup/bl_ui/properties_object_constraint.py b/release/scripts/startup/bl_ui/properties_object_constraint.py
index 03823ad7345..5f79dd3127a 100644
--- a/release/scripts/startup/bl_ui/properties_object_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_object_constraint.py
@@ -655,8 +655,8 @@ class ConstraintButtonsPanel():
         row = col.row()
         row.label(text="Source to Destination Mapping:")
 
-		# note: chr(187) is the ASCII arrow ( >> ). Blender Text Editor can't
-		# open it. Thus we are using the hardcoded value instead.
+        # note: chr(187) is the ASCII arrow ( >> ). Blender Text Editor can't
+        # open it. Thus we are using the hardcoded value instead.
         row = col.row()
         row.prop(con, "map_to_x_from", expand=False, text="")
         row.label(text=" %s    X" % chr(187))
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index 8017720671e..0001c1c74b9 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -200,7 +200,7 @@ void BPY_python_start(int argc, const char **argv)
 	/* allow to use our own included python */
 	PyC_SetHomePath(BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL));
 
-	/* Python 3.2 now looks for '2.57/python/include/python3.2d/pyconfig.h' to parse
+	/* Python 3.2 now looks for '2.58/python/include/python3.2d/pyconfig.h' to parse
 	 * from the 'sysconfig' module which is used by 'site', so for now disable site.
 	 * alternatively we could copy the file. */
 	Py_NoSiteFlag= 1;