[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32560] trunk/blender/source/blender/ python/generic/bpy_internal_import.c: bugfix [#24306] Python : relative import error

Campbell Barton ideasman42 at gmail.com
Mon Oct 18 13:37:54 CEST 2010


Revision: 32560
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32560
Author:   campbellbarton
Date:     2010-10-18 13:37:53 +0200 (Mon, 18 Oct 2010)

Log Message:
-----------
bugfix [#24306] Python : relative import error

Modified Paths:
--------------
    trunk/blender/source/blender/python/generic/bpy_internal_import.c

Modified: trunk/blender/source/blender/python/generic/bpy_internal_import.c
===================================================================
--- trunk/blender/source/blender/python/generic/bpy_internal_import.c	2010-10-18 11:21:22 UTC (rev 32559)
+++ trunk/blender/source/blender/python/generic/bpy_internal_import.c	2010-10-18 11:37:53 UTC (rev 32560)
@@ -198,18 +198,18 @@
 	char *name;
 	int found= 0;
 	PyObject *globals = NULL, *locals = NULL, *fromlist = NULL;
+	int level= -1; /* relative imports */
+	
 	PyObject *newmodule;
-	
 	//PyObject_Print(args, stderr, 0);
-	int dummy_val; /* what does this do?*/
 	static char *kwlist[] = {"name", "globals", "locals", "fromlist", "level", 0};
 	
 	if( !PyArg_ParseTupleAndKeywords( args, kw, "s|OOOi:bpy_import_meth", kwlist,
-				   &name, &globals, &locals, &fromlist, &dummy_val) )
+				   &name, &globals, &locals, &fromlist, &level) )
 		return NULL;
 
 	/* import existing builtin modules or modules that have been imported already */
-	newmodule = PyImport_ImportModuleEx( name, globals, locals, fromlist );
+	newmodule= PyImport_ImportModuleLevel(name, globals, locals, fromlist, level);
 	
 	if(newmodule)
 		return newmodule;





More information about the Bf-blender-cvs mailing list