[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51941] trunk/blender/source/blender/ python/generic/bpy_internal_import.c: was trying to make py import follow pythons own code more but broke py32 compat .

[Campbell Barton]

Revision: 51941
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51941
Author:   campbellbarton
Date:     2012-11-06 13:29:00 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
was trying to make py import follow pythons own code more but broke py32 compat. this should fix

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	2012-11-06 13:22:33 UTC (rev 51940)
+++ trunk/blender/source/blender/python/generic/bpy_internal_import.c	2012-11-06 13:29:00 UTC (rev 51941)
@@ -257,8 +257,7 @@
 static PyObject *blender_import(PyObject *UNUSED(self), PyObject *args, PyObject *kw)
 {
 	PyObject *exception, *err, *tb;
-	//char *name;
-	PyObject *name;
+	char *name;
 	int found = 0;
 	PyObject *globals = NULL, *locals = NULL, *fromlist = NULL;
 	int level = 0; /* relative imports */
@@ -267,14 +266,14 @@
 	//PyObject_Print(args, stderr, 0);
 	static const char *kwlist[] = {"name", "globals", "locals", "fromlist", "level", NULL};
 	
-	if (!PyArg_ParseTupleAndKeywords(args, kw, "U|OOOi:bpy_import_meth", (char **)kwlist,
+	if (!PyArg_ParseTupleAndKeywords(args, kw, "s|OOOi:bpy_import_meth", (char **)kwlist,
 	                                 &name, &globals, &locals, &fromlist, &level))
 	{
 		return NULL;
 	}
 
 	/* import existing builtin modules or modules that have been imported already */
-	newmodule = PyImport_ImportModuleLevelObject(name, globals, locals, fromlist, level);
+	newmodule = PyImport_ImportModuleLevel(name, globals, locals, fromlist, level);
 	
 	if (newmodule)
 		return newmodule;
@@ -282,7 +281,7 @@
 	PyErr_Fetch(&exception, &err, &tb); /* get the python error in case we cant import as blender text either */
 	
 	/* importing from existing modules failed, see if we have this module as blender text */
-	newmodule = bpy_text_import_name(_PyUnicode_AsString(name), &found);
+	newmodule = bpy_text_import_name(name, &found);
 	
 	if (newmodule) { /* found module as blender text, ignore above exception */
 		PyErr_Clear();