odd, this didn't get committed before

source/blender/python/intern/bpy_util.c

@@ -1,5 +1,5 @@
 /**
- * $Id$
+ * $Id: bpy_util.c 21526 2009-07-11 13:57:56Z campbellbarton $
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -81,6 +81,7 @@ int BPY_flag_from_seq(BPY_flag_def *flagdef, PyObject *seq, int *flag)
 	char *cstring;
 	PyObject *item;
 	BPY_flag_def *fd;
+	*flag = 0;
 
 	if (PySequence_Check(seq)) {
 		i= PySequence_Length(seq);
@@ -108,6 +109,9 @@ int BPY_flag_from_seq(BPY_flag_def *flagdef, PyObject *seq, int *flag)
 		error_val= 1;
 	}
 
+	if (*flag == 0)
+		error_val = 1;
+
 	if (error_val) {
 		char *buf = bpy_flag_error_str(flagdef);
 		PyErr_SetString(PyExc_AttributeError, buf);
@@ -167,7 +171,13 @@ void PyObSpit(char *name, PyObject *var) {
 	else {
 		PyObject_Print(var, stderr, 0);
 		fprintf(stderr, " ref:%d ", var->ob_refcnt);
-		fprintf(stderr, " ptr:%ld", (long)var);
+		fprintf(stderr, " ptr:%p", (void *)var);
+		
+		fprintf(stderr, " type:");
+		if(Py_TYPE(var))
+			fprintf(stderr, "%s", Py_TYPE(var)->tp_name);
+		else
+			fprintf(stderr, "<NIL>");
 	}
 	fprintf(stderr, "\n");
 }
@@ -329,6 +339,81 @@ int BPY_class_validate(const char *class_type, PyObject *class, PyObject *base_c
 	return 0;
 }
 
+
+
+/* returns the exception string as a new PyUnicode object, depends on external StringIO module */
+PyObject *BPY_exception_buffer(void)
+{
+	PyObject *stdout_backup = PySys_GetObject("stdout"); /* borrowed */
+	PyObject *stderr_backup = PySys_GetObject("stderr"); /* borrowed */
+	PyObject *string_io = NULL;
+	PyObject *string_io_buf = NULL;
+	PyObject *string_io_mod= NULL;
+	PyObject *string_io_getvalue= NULL;
+	
+	PyObject *error_type, *error_value, *error_traceback;
+	
+	if (!PyErr_Occurred())
+		return NULL;
+	
+	PyErr_Fetch(&error_type, &error_value, &error_traceback);
+	
+	PyErr_Clear();
+	
+	/* import StringIO / io
+	 * string_io = StringIO.StringIO()
+	 */
+	
+#if PY_VERSION_HEX < 0x03000000
+	if(! (string_io_mod= PyImport_ImportModule("StringIO")) ) {
+#else
+	if(! (string_io_mod= PyImport_ImportModule("io")) ) {
+#endif
+		goto error_cleanup;
+	} else if (! (string_io = PyObject_CallMethod(string_io_mod, "StringIO", NULL))) {
+		goto error_cleanup;
+	} else if (! (string_io_getvalue= PyObject_GetAttrString(string_io, "getvalue"))) {
+		goto error_cleanup;
+	}
+	
+	Py_INCREF(stdout_backup); // since these were borrowed we dont want them freed when replaced.
+	Py_INCREF(stderr_backup);
+	
+	PySys_SetObject("stdout", string_io); // both of these are free'd when restoring
+	PySys_SetObject("stderr", string_io);
+	
+	PyErr_Restore(error_type, error_value, error_traceback);
+	PyErr_Print(); /* print the error */
+	PyErr_Clear();
+	
+	string_io_buf = PyObject_CallObject(string_io_getvalue, NULL);
+	
+	PySys_SetObject("stdout", stdout_backup);
+	PySys_SetObject("stderr", stderr_backup);
+	
+	Py_DECREF(stdout_backup); /* now sys owns the ref again */
+	Py_DECREF(stderr_backup);
+	
+	Py_DECREF(string_io_mod);
+	Py_DECREF(string_io_getvalue);
+	Py_DECREF(string_io); /* free the original reference */
+	
+	PyErr_Clear();
+	return string_io_buf;
+	
+	
+error_cleanup:
+	/* could not import the module so print the error and close */
+	Py_XDECREF(string_io_mod);
+	Py_XDECREF(string_io);
+	
+	PyErr_Restore(error_type, error_value, error_traceback);
+	PyErr_Print(); /* print the error */
+	PyErr_Clear();
+	
+	return NULL;
+}
+
 char *BPy_enum_as_string(EnumPropertyItem *item)
 {
 	DynStr *dynstr= BLI_dynstr_new();
@@ -336,7 +421,8 @@ char *BPy_enum_as_string(EnumPropertyItem *item)
 	char *cstring;
 
 	for (e= item; item->identifier; item++) {
-		BLI_dynstr_appendf(dynstr, (e==item)?"'%s'":", '%s'", item->identifier);
+		if(item->identifier[0])
+			BLI_dynstr_appendf(dynstr, (e==item)?"'%s'":", '%s'", item->identifier);
 	}
 
 	cstring = BLI_dynstr_get_cstring(dynstr);
@@ -358,3 +444,33 @@ int BPy_reports_to_error(ReportList *reports)
 	return (report_str != NULL);
 }
 
+
+int BPy_errors_to_report(ReportList *reports)
+{
+	PyObject *pystring;
+	char *cstring;
+	
+	if (!PyErr_Occurred())
+		return 1;
+	
+	/* less hassle if we allow NULL */
+	if(reports==NULL) {
+		PyErr_Print();
+		PyErr_Clear();
+		return 1;
+	}
+	
+	pystring= BPY_exception_buffer();
+	
+	if(pystring==NULL) {
+		BKE_report(reports, RPT_ERROR, "unknown py-exception, could not convert");
+		return 0;
+	}
+	
+	cstring= _PyUnicode_AsString(pystring);
+	
+	BKE_report(reports, RPT_ERROR, cstring);
+	fprintf(stderr, "%s\n", cstring); // not exactly needed. just for testing
+	Py_DECREF(pystring);
+	return 1;
+}