[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36012] trunk/blender: quiet warning & minor pep8 edits.

[Campbell Barton]

Revision: 36012
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36012
Author:   campbellbarton
Date:     2011-04-04 22:42:43 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
quiet warning & minor pep8 edits.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_qtcreator_project.py
    trunk/blender/doc/manpage/blender.1
    trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
    trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
    trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/tests/bl_test.py

Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py	2011-04-04 22:40:56 UTC (rev 36011)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py	2011-04-04 22:42:43 UTC (rev 36012)
@@ -125,7 +125,6 @@
     defines = []
 
 
-
     create_eclipse_project(CMAKE_DIR)
 
     from xml.dom.minidom import parse

Modified: trunk/blender/doc/manpage/blender.1
===================================================================
(Binary files differ)

Modified: trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py	2011-04-04 22:40:56 UTC (rev 36011)
+++ trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py	2011-04-04 22:42:43 UTC (rev 36012)
@@ -73,7 +73,7 @@
             row.prop(dopesheet, "show_only_group_objects", text="")
             if dopesheet.show_only_group_objects:
                 row.prop(dopesheet, "filter_group", text="")
-   
+
     if not is_nla:
         row = layout.row(align=True)
         row.prop(dopesheet, "show_only_matching_fcurves", text="")

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2011-04-04 22:40:56 UTC (rev 36011)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2011-04-04 22:42:43 UTC (rev 36012)
@@ -1052,9 +1052,9 @@
         layout.operator("object.vertex_group_invert", text="Invert")
         layout.operator("object.vertex_group_clean", text="Clean")
         layout.operator("object.vertex_group_levels", text="Levels")
-        
+
         layout.separator()
-        
+
         layout.operator("paint.weight_set")
 
 # ********** Sculpt menu **********

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-04-04 22:40:56 UTC (rev 36011)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2011-04-04 22:42:43 UTC (rev 36012)
@@ -1202,7 +1202,7 @@
 
     def draw(self, context):
         layout = self.layout
-        
+
         tool_settings = context.tool_settings
 
         col = layout.column()

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-04-04 22:40:56 UTC (rev 36011)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-04-04 22:42:43 UTC (rev 36012)
@@ -1028,7 +1028,6 @@
 	size_t in_len;
 #ifdef WITH_LZO
 	size_t out_len = len;
-	size_t sizeOfIt = 5;
 #endif
 	unsigned char *in;
 	unsigned char *props = MEM_callocN(16*sizeof(char), "tmp");
@@ -1051,6 +1050,7 @@
 #ifdef WITH_LZMA
 			if(compressed == 2)
 			{
+				size_t sizeOfIt;
 				size_t leni = in_len, leno = out_len;
 				ptcache_file_read(pf, &size, 1, sizeof(unsigned int));
 				sizeOfIt = (size_t)size;

Modified: trunk/blender/source/tests/bl_test.py
===================================================================
--- trunk/blender/source/tests/bl_test.py	2011-04-04 22:40:56 UTC (rev 36011)
+++ trunk/blender/source/tests/bl_test.py	2011-04-04 22:42:43 UTC (rev 36012)
@@ -170,7 +170,9 @@
         md5_update = md5_instance.update
 
         for f in md5_source:
-            md5_update(open(f, "rb").read())
+            filehandle = open(f, "rb")
+            md5_update(filehandle.read())
+            filehandle.close()
 
         md5_new = md5_instance.hexdigest()