[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25170] trunk/blender: - string copy without .py wasnt terminating the string

[Campbell Barton]

Revision: 25170
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25170
Author:   campbellbarton
Date:     2009-12-07 15:09:53 +0100 (Mon, 07 Dec 2009)

Log Message:
-----------
- string copy without .py wasnt terminating the string
- console import autocomplete wasnt including modules defined in C like BGL, Mathutils

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/console/complete_import.py
    trunk/blender/source/blender/python/generic/bpy_internal_import.c

Modified: trunk/blender/release/scripts/modules/console/complete_import.py
===================================================================
--- trunk/blender/release/scripts/modules/console/complete_import.py	2009-12-07 12:11:28 UTC (rev 25169)
+++ trunk/blender/release/scripts/modules/console/complete_import.py	2009-12-07 14:09:53 UTC (rev 25170)
@@ -69,10 +69,13 @@
 
     modules += sys.builtin_module_names
 
+    # needed for modules defined in C
+    modules += sys.modules.keys()
+
     modules = list(set(modules))
     if '__init__' in modules:
         modules.remove('__init__')
-    modules = sorted(set(modules))
+    modules = sorted(modules)
     if store:
         ROOT_MODULES = modules
     return modules

Modified: trunk/blender/source/blender/python/generic/bpy_internal_import.c
===================================================================
--- trunk/blender/source/blender/python/generic/bpy_internal_import.c	2009-12-07 12:11:28 UTC (rev 25169)
+++ trunk/blender/source/blender/python/generic/bpy_internal_import.c	2009-12-07 14:09:53 UTC (rev 25170)
@@ -74,8 +74,9 @@
 		}
 	}
 
-	len= strlen(text->id.name+2) - 3;
+	len= strlen(text->id.name+2);
 	strncpy(modulename, text->id.name+2, len);
+	modulename[len - 3]= '\0'; /* remove .py */
 	return PyImport_ExecCodeModule(modulename, text->compiled);
 }