Changeset: dff7ec8faae6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dff7ec8faae6
Modified Files:
sql/backends/monet5/UDF/pyapi3/connection3.c
sql/backends/monet5/UDF/pyapi3/conversion3.c
sql/backends/monet5/UDF/pyapi3/convert_loops.h
sql/backends/monet5/UDF/pyapi3/emit3.c
sql/backends/monet5/UDF/pyapi3/formatinput3.c
sql/backends/monet5/UDF/pyapi3/pyapi3.c
sql/backends/monet5/UDF/pyapi3/pyheader.h
sql/backends/monet5/UDF/pyapi3/pytypes.h
sql/backends/monet5/UDF/pyapi3/pytypes3.c
sql/backends/monet5/UDF/pyapi3/type_conversion3.c
Branch: default
Log Message:
Don't define Python 2 names to Python 3 names, just use the Python 3 names.
diffs (294 lines):
diff --git a/sql/backends/monet5/UDF/pyapi3/connection3.c
b/sql/backends/monet5/UDF/pyapi3/connection3.c
--- a/sql/backends/monet5/UDF/pyapi3/connection3.c
+++ b/sql/backends/monet5/UDF/pyapi3/connection3.c
@@ -16,7 +16,7 @@
static PyObject *_connection_execute(Py_ConnectionObject *self, PyObject *args)
{
char *query = NULL;
- if (PyString_CheckExact(args)) {
+ if (PyUnicode_CheckExact(args)) {
query = GDKstrdup(PyUnicode_AsUTF8(args));
} else {
PyErr_Format(PyExc_TypeError,
@@ -75,7 +75,7 @@ static PyObject *_connection_execute(Py_
return NULL;
}
PyDict_SetItem(result,
-
PyString_FromString(output->cols[i].name),
+
PyUnicode_FromString(output->cols[i].name),
numpy_array);
Py_DECREF(numpy_array);
BBPunfix(input.bat->batCacheid);
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
@@ -42,19 +42,19 @@ PyObject *PyArrayObject_FromScalar(PyInp
#endif
break;
case TYPE_oid:
- vararray = PyInt_FromLong((long)(*(oid *)inp->dataptr));
+ vararray = PyLong_FromLong((long)(*(oid
*)inp->dataptr));
break;
case TYPE_bit:
- vararray = PyInt_FromLong((long)(*(bit *)inp->dataptr));
+ vararray = PyLong_FromLong((long)(*(bit
*)inp->dataptr));
break;
case TYPE_bte:
- vararray = PyInt_FromLong((long)(*(bte *)inp->dataptr));
+ vararray = PyLong_FromLong((long)(*(bte
*)inp->dataptr));
break;
case TYPE_sht:
- vararray = PyInt_FromLong((long)(*(sht *)inp->dataptr));
+ vararray = PyLong_FromLong((long)(*(sht
*)inp->dataptr));
break;
case TYPE_int:
- vararray = PyInt_FromLong((long)(*(int *)inp->dataptr));
+ vararray = PyLong_FromLong((long)(*(int
*)inp->dataptr));
break;
case TYPE_lng:
vararray = PyLong_FromLongLong((*(lng *)inp->dataptr));
@@ -111,7 +111,7 @@ PyObject *PyMaskedArray_FromBAT(PyInput
if (b->tnil || !b->tnonil) {
PyObject *mask;
PyObject *mafunc = PyObject_GetAttrString(
- PyImport_Import(PyString_FromString("numpy.ma")),
"masked_array");
+ PyImport_Import(PyUnicode_FromString("numpy.ma")),
"masked_array");
PyObject *nullmask = PyNullMask_FromBAT(b, t_start, t_end);
if (!nullmask) {
@@ -350,7 +350,7 @@ PyObject *PyArrayObject_FromBAT(PyInput
const char *t =
(const char *)BUNtvar(li, p);
ptrdiff_t
offset = t - b->tvheap->base;
if
(!pyptrs[offset]) {
-
pyptrs[offset] = PyString_FromString(t);
+
pyptrs[offset] = PyUnicode_FromString(t);
} else {
Py_INCREF(pyptrs[offset]);
}
@@ -361,7 +361,7 @@ PyObject *PyArrayObject_FromBAT(PyInput
BATloop(b, p, q)
{
const char *t =
(const char *)BUNtvar(li, p);
- obj =
PyString_FromString(t);
+ obj =
PyUnicode_FromString(t);
if (obj ==
NULL) {
bat_iterator_end(&li);
msg =
createException(
@@ -634,7 +634,7 @@ PyObject *PyObject_CheckForConversion(Py
SQLSTATE(PY000) "Unsupported result
object. Expected either a list, "
"dictionary, a numpy array, a numpy
masked array or a "
"pandas data frame, but received an
object of type \"%s\"",
-
PyString_AsString(PyObject_Str(PyObject_Type(data))));
+
PyUnicode_AsUTF8(PyObject_Str(PyObject_Type(data))));
goto wrapup;
}
diff --git a/sql/backends/monet5/UDF/pyapi3/convert_loops.h
b/sql/backends/monet5/UDF/pyapi3/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi3/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi3/convert_loops.h
@@ -397,7 +397,7 @@ convert_and_append(BAT* b, const char* t
break;
\
case NPY_UNICODE:
\
NP_COL_BAT_LOOP_FUNC(bat, mtpe,
unicode_to_##mtpe, \
-
PythonUnicodeType, index); \
+
Py_UNICODE, index); \
break;
\
case NPY_OBJECT:
\
NP_COL_BAT_LOOP_FUNC(bat, mtpe,
pyobject_to_##mtpe, \
diff --git a/sql/backends/monet5/UDF/pyapi3/emit3.c
b/sql/backends/monet5/UDF/pyapi3/emit3.c
--- a/sql/backends/monet5/UDF/pyapi3/emit3.c
+++ b/sql/backends/monet5/UDF/pyapi3/emit3.c
@@ -60,7 +60,7 @@ PyObject *PyEmit_Emit(PyEmitObject *self
if (this_size < 0) {
PyErr_Format(
PyExc_TypeError, "Unsupported Python
Object %s",
-
PyString_AsString(PyObject_Str(PyObject_Type(dictEntry))));
+
PyUnicode_AsUTF8(PyObject_Str(PyObject_Type(dictEntry))));
Py_DECREF(items);
return NULL;
}
@@ -71,7 +71,7 @@ PyObject *PyEmit_Emit(PyEmitObject *self
PyErr_Format(
PyExc_TypeError, "Element %s has size
%zd, but expected an "
"element with size %zd",
- PyString_AsString(PyObject_Str(key)),
this_size, el_count);
+ PyUnicode_AsUTF8(PyObject_Str(key)),
this_size, el_count);
Py_DECREF(items);
return NULL;
}
@@ -110,7 +110,7 @@ PyObject *PyEmit_Emit(PyEmitObject *self
PyErr_Format(
PyExc_TypeError,
"Could not convert object type
%s to a string: %s",
-
PyString_AsString(PyObject_Str(PyObject_Type(key))),
+
PyUnicode_AsUTF8(PyObject_Str(PyObject_Type(key))),
msg);
free(val);
goto loop_end;
@@ -167,7 +167,7 @@ PyObject *PyEmit_Emit(PyEmitObject *self
PyErr_Format(
PyExc_TypeError,
"Could not convert object type %s to a
string: %s",
-
PyString_AsString(PyObject_Str(PyObject_Type(key))), msg);
+
PyUnicode_AsUTF8(PyObject_Str(PyObject_Type(key))), msg);
error = true;
Py_DECREF(keys);
free(val);
diff --git a/sql/backends/monet5/UDF/pyapi3/formatinput3.c
b/sql/backends/monet5/UDF/pyapi3/formatinput3.c
--- a/sql/backends/monet5/UDF/pyapi3/formatinput3.c
+++ b/sql/backends/monet5/UDF/pyapi3/formatinput3.c
@@ -48,7 +48,7 @@ PyObject *PyCodeObject_ParseString(char
}
code_copy[j] = '\0';
tuple = PyTuple_New(1);
- mystr = PyString_FromStringAndSize(
+ mystr = PyUnicode_FromStringAndSize(
code_copy,
j); // use FromStringAndSize because the string is not
null-terminated
PyTuple_SetItem(tuple, 0, mystr);
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
@@ -682,7 +682,7 @@ static str PyAPIeval(Client cntxt, MalBl
goto wrapup;
}
if (code_object == NULL) {
- PyObject *arg_type = PyString_FromString(
+ PyObject *arg_type = PyUnicode_FromString(
BatType_Format(pyinput_values[i - (pci->retc +
2 + has_card_arg)].bat_type));
PyDict_SetItemString(pColumns, args[i], result_array);
PyDict_SetItemString(pColumnTypes, args[i], arg_type);
@@ -1028,7 +1028,7 @@ static str PyAPIeval(Client cntxt, MalBl
retnames = GDKzalloc(sizeof(char *) * retcols);
for (i = 0; i < retcols; i++) {
PyObject *colname =
PyList_GetItem(keys, i);
- if (!PyString_CheckExact(colname)) {
+ if (!PyUnicode_CheckExact(colname)) {
msg = createException(MAL,
"pyapi3.eval",
SQLSTATE(PY000) "Expected a string key in the "
"dictionary, but received an "
@@ -1397,7 +1397,7 @@ PYAPI3PyAPIprelude(void *ret) {
}
_pytypes_init();
_loader_init();
- tmp = PyString_FromString("marshal");
+ tmp = PyUnicode_FromString("marshal");
marshal_module = PyImport_Import(tmp);
Py_DECREF(tmp);
if (marshal_module == NULL) {
@@ -1441,7 +1441,7 @@ char *PyError_CreateException(char *erro
&py_error_traceback);
error = PyObject_Str(py_error_value);
- py_error_string = PyString_AS_STRING(error);
+ py_error_string = PyUnicode_AsUTF8(error);
Py_XDECREF(error);
if (pycall != NULL && strlen(pycall) > 0) {
if (py_error_traceback == NULL) {
diff --git a/sql/backends/monet5/UDF/pyapi3/pyheader.h
b/sql/backends/monet5/UDF/pyapi3/pyheader.h
--- a/sql/backends/monet5/UDF/pyapi3/pyheader.h
+++ b/sql/backends/monet5/UDF/pyapi3/pyheader.h
@@ -65,16 +65,6 @@
#define pyapi_export extern
#endif
-#define PyString_FromString PyUnicode_FromString
-#define PyString_Check PyUnicode_Check
-#define PyString_CheckExact PyUnicode_CheckExact
-#define PyString_AsString PyUnicode_AsUTF8
-#define PyString_AS_STRING PyUnicode_AsUTF8
-#define PyString_FromStringAndSize PyUnicode_FromStringAndSize
-#define PyInt_FromLong PyLong_FromLong
-#define PyInt_Check PyLong_Check
-#define PythonUnicodeType Py_UNICODE
-
#define utf8string_minlength 256
#endif /* _PYHEADER_H_ */
diff --git a/sql/backends/monet5/UDF/pyapi3/pytypes.h
b/sql/backends/monet5/UDF/pyapi3/pytypes.h
--- a/sql/backends/monet5/UDF/pyapi3/pytypes.h
+++ b/sql/backends/monet5/UDF/pyapi3/pytypes.h
@@ -60,10 +60,10 @@ pyapi_export int BatType_ToPyType(int);
pyapi_export bool Python_ObtainGIL(void);
pyapi_export bool Python_ReleaseGIL(bool);
-#define bte_TO_PYSCALAR(value) PyInt_FromLong(value)
-#define bit_TO_PYSCALAR(value) PyInt_FromLong(value)
-#define sht_TO_PYSCALAR(value) PyInt_FromLong(value)
-#define int_TO_PYSCALAR(value) PyInt_FromLong(value)
+#define bte_TO_PYSCALAR(value) PyLong_FromLong(value)
+#define bit_TO_PYSCALAR(value) PyLong_FromLong(value)
+#define sht_TO_PYSCALAR(value) PyLong_FromLong(value)
+#define int_TO_PYSCALAR(value) PyLong_FromLong(value)
#define lng_TO_PYSCALAR(value) PyLong_FromLongLong(value)
#define flt_TO_PYSCALAR(value) PyFloat_FromDouble(value)
#define dbl_TO_PYSCALAR(value) PyFloat_FromDouble(value)
diff --git a/sql/backends/monet5/UDF/pyapi3/pytypes3.c
b/sql/backends/monet5/UDF/pyapi3/pytypes3.c
--- a/sql/backends/monet5/UDF/pyapi3/pytypes3.c
+++ b/sql/backends/monet5/UDF/pyapi3/pytypes3.c
@@ -223,7 +223,7 @@ int BatType_ToPyType(int type)
bool PyType_IsPandasDataFrame(PyObject *object)
{
PyObject *str = PyObject_Str(PyObject_Type(object));
- bool ret = strcmp(PyString_AsString(str),
+ bool ret = strcmp(PyUnicode_AsUTF8(str),
"<class
'pandas.core.frame.DataFrame'>") == 0;
Py_DECREF(str);
return ret;
@@ -232,7 +232,7 @@ bool PyType_IsPandasDataFrame(PyObject *
bool PyType_IsNumpyMaskedArray(PyObject *object)
{
PyObject *str = PyObject_Str(PyObject_Type(object));
- bool ret = strcmp(PyString_AsString(str),
+ bool ret = strcmp(PyUnicode_AsUTF8(str),
"<class
'numpy.ma.core.MaskedArray'>") == 0;
Py_DECREF(str);
return ret;
@@ -241,7 +241,7 @@ bool PyType_IsNumpyMaskedArray(PyObject
bool PyType_IsLazyArray(PyObject *object)
{
PyObject *str = PyObject_Str(PyObject_Type(object));
- bool ret = strcmp(PyString_AsString(str), "<class 'lazyarray'>") == 0;
+ bool ret = strcmp(PyUnicode_AsUTF8(str), "<class 'lazyarray'>") == 0;
Py_DECREF(str);
return ret;
}
@@ -271,11 +271,10 @@ bool PyType_IsPyScalar(PyObject *object)
{
if (object == NULL)
return false;
- return (PyArray_CheckScalar(object) || PyInt_Check(object) ||
- PyFloat_Check(object) || PyLong_Check(object) ||
- PyString_Check(object) || PyBool_Check(object) ||
- PyUnicode_Check(object) || PyByteArray_Check(object)
- || PyBytes_Check(object));
+ return (PyArray_CheckScalar(object) || PyLong_Check(object) ||
+ PyFloat_Check(object) || PyUnicode_Check(object) ||
+ PyBool_Check(object) || PyByteArray_Check(object) ||
+ PyBytes_Check(object));
}
void _pytypes_init(void) { _import_array(); }
diff --git a/sql/backends/monet5/UDF/pyapi3/type_conversion3.c
b/sql/backends/monet5/UDF/pyapi3/type_conversion3.c
--- a/sql/backends/monet5/UDF/pyapi3/type_conversion3.c
+++ b/sql/backends/monet5/UDF/pyapi3/type_conversion3.c
@@ -12,9 +12,6 @@
#include <longintrepr.h>
-#define PyInt_Check PyLong_Check
-#define PyString_CheckExact PyUnicode_CheckExact
-
bool pyapi3_string_copy(const char *source, char *dest, size_t max_size, bool
allow_unicode)
{
size_t i;
@@ -150,8 +147,7 @@ str pyobject_to_str(PyObject **ptr, size
"object.\n");
goto wrapup;
}
- } else if (PyBool_Check(obj) || PyLong_Check(obj) || PyInt_Check(obj) ||
- PyFloat_Check(obj)) {
+ } else if (PyBool_Check(obj) || PyLong_Check(obj) ||
PyFloat_Check(obj)) {
#ifdef HAVE_HGE
hge h;
pyobject_to_hge(&obj, 0, &h);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
