Changeset: 07b23de27a1d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=07b23de27a1d
Modified Files:
configure.ag
monetdb5/extras/pyapi/pyapi.c
Branch: fixed-width-format
Log Message:
merge with default
diffs (29 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2359,7 +2359,7 @@ if test "x$enable_pyintegration" != xno;
;;
esac
if test "x$have_pyconfig" = x; then
- AC_PATH_PROG(PYCMD,python-config,,$XPATH)
+ AC_PATH_PROG(PYCMD,python-config,no,$PATH)
if test "x$PYCMD" = x; then
if test "x$enable_pyintegration" = xyes; then
AC_MSG_ERROR([python-config library required
for Python integration support])
diff --git a/monetdb5/extras/pyapi/pyapi.c b/monetdb5/extras/pyapi/pyapi.c
--- a/monetdb5/extras/pyapi/pyapi.c
+++ b/monetdb5/extras/pyapi/pyapi.c
@@ -1620,10 +1620,10 @@ str
MT_lock_set(&pyapiLock);
if (!pyapiInitialized) {
str msg = MAL_SUCCEED;
- char* iar = NULL;
Py_Initialize();
- PyRun_SimpleString("import numpy");
- import_array1(iar);
+ if (PyRun_SimpleString("import numpy") != 0 || _import_array() <
0) {
+ return PyError_CreateException("Failed to initialize embedded
python", NULL);
+ }
msg = _connection_init();
marshal_module = PyImport_Import(PyString_FromString("marshal"));
if (marshal_module == NULL) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
