Changeset: c48707962de4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c48707962de4
Modified Files:
sql/backends/monet5/UDF/pyapi3/conversion3.c
sql/backends/monet5/UDF/pyapi3/pyapi3.c
Branch: Aug2024
Log Message:
Use PyImport_ImportModule instead of PyImport_Import.
diffs (39 lines):
diff --git a/sql/backends/monet5/UDF/pyapi3/conversion3.c
b/sql/backends/monet5/UDF/pyapi3/conversion3.c
--- a/sql/backends/monet5/UDF/pyapi3/conversion3.c
+++ b/sql/backends/monet5/UDF/pyapi3/conversion3.c
@@ -136,11 +136,9 @@ PyMaskedArray_FromBAT(PyInput *inp, size
bool bnonil = b->tnonil;
MT_lock_unset(&b->theaplock);
if (!bnonil) {
- PyObject *nme = PyUnicode_FromString("numpy.ma");
- PyObject *mod = PyImport_Import(nme);
+ PyObject *mod = PyImport_ImportModule("numpy.ma");
PyObject *mafunc = PyObject_GetAttrString( mod, "masked_array");
PyObject *nullmask = PyNullMask_FromBAT(b, t_start, t_end);
- Py_DECREF(nme);
if (!nullmask) {
Py_DECREF(vararray);
diff --git a/sql/backends/monet5/UDF/pyapi3/pyapi3.c
b/sql/backends/monet5/UDF/pyapi3/pyapi3.c
--- a/sql/backends/monet5/UDF/pyapi3/pyapi3.c
+++ b/sql/backends/monet5/UDF/pyapi3/pyapi3.c
@@ -662,7 +662,6 @@ PYAPI3PyAPIprelude(void) {
wchar_t* program = L"mserver5";
wchar_t* argv[] = { program, NULL };
str msg = MAL_SUCCEED;
- PyObject *tmp;
static_assert(PY_MAJOR_VERSION == 3, "Python 3.X required");
#if PY_MINOR_VERSION >= 11
@@ -705,10 +704,8 @@ PYAPI3PyAPIprelude(void) {
}
_pytypes_init();
_loader_init();
- tmp = PyUnicode_FromString("marshal");
- marshal_module = PyImport_Import(tmp);
+ marshal_module = PyImport_ImportModule("marshal");
init_DateTimeAPI();
- Py_DECREF(tmp);
if (marshal_module == NULL) {
MT_lock_unset(&pyapiLock);
return createException(MAL, "pyapi3.eval",
SQLSTATE(PY000) "Failed to load Marshal module.");
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
