[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40550] trunk/blender: wm. py needs import os in some of its execute funcs + now we can have blender2. 60x version :)

[Dalai Felinto]

Revision: 40550
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40550
Author:   dfelinto
Date:     2011-09-26 06:29:58 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
wm.py needs import os in some of its execute funcs + now we can have blender2.60x version :)
I guess someone did a cleanup in the file and forgot to test "add an Add-On" ;)
+ a bug I found while studying the cmake files

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/release/scripts/startup/bl_operators/wm.py

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-09-26 05:35:57 UTC (rev 40549)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-09-26 06:29:58 UTC (rev 40550)
@@ -482,7 +482,7 @@
 	if(${_out_version_char_empty})
 		set(BLENDER_VERSION_CHAR_INDEX "0")
 	else()
-		set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w q y z)
+		set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w x y z)
 		list(FIND _char_ls ${BLENDER_VERSION_CHAR} _out_version_char_index)
 		math(EXPR BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index} + 1")
 		unset(_char_ls)

Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py	2011-09-26 05:35:57 UTC (rev 40549)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py	2011-09-26 06:29:58 UTC (rev 40550)
@@ -1683,6 +1683,7 @@
 
     @staticmethod
     def _module_remove(path_addons, module):
+        import os
         module = os.path.splitext(module)[0]
         for f in os.listdir(path_addons):
             f_base = os.path.splitext(f)[0]
@@ -1699,6 +1700,7 @@
         import traceback
         import zipfile
         import shutil
+        import os
 
         pyfile = self.filepath