Skip to content

MAINT: Fix deprecated functions in scalarapi.c #16776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charris merged 1 commit into from
Jul 7, 2020
Merged

MAINT: Fix deprecated functions in scalarapi.c #16776

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions numpy/core/src/multiarray/scalarapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ scalar_value(PyObject *scalar, PyArray_Descr *descr)
CASE(TIMEDELTA, Timedelta);
#undef CASE
case NPY_STRING:
return (void *)PyString_AS_STRING(scalar);
return (void *)PyBytes_AsString(scalar);
case NPY_UNICODE:
/* lazy initialization, to reduce the memory used by string scalars */
if (PyArrayScalar_VAL(scalar, Unicode) == NULL) {
Expand Down Expand Up @@ -141,7 +141,18 @@ scalar_value(PyObject *scalar, PyArray_Descr *descr)
return (void *)PyString_AS_STRING(scalar);
}
if (_CHK(Unicode)) {
return (void *)PyUnicode_AS_DATA(scalar);
/* Treat this the same as the NPY_UNICODE base class */

/* lazy initialization, to reduce the memory used by string scalars */
if (PyArrayScalar_VAL(scalar, Unicode) == NULL) {
Py_UCS4 *raw_data = PyUnicode_AsUCS4Copy(scalar);
if (raw_data == NULL) {
return NULL;
}
PyArrayScalar_VAL(scalar, Unicode) = raw_data;
return (void *)raw_data;
}
return PyArrayScalar_VAL(scalar, Unicode);
}
if (_CHK(Void)) {
/* Note: no & needed here, so can't use _IFCASE */
Expand Down