diff options
| author | Matti Picus <matti.picus@gmail.com> | 2022-04-21 13:29:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 13:29:07 +0300 |
| commit | 16861414438a2fe2b44d86fe1af264fab320cf1a (patch) | |
| tree | a157d7c54c9fe5ecdbf978e9db8d5add15f07e28 | |
| parent | f55ab1b4cbd48226c27e4747e8125d73f1f21e54 (diff) | |
| parent | 17c1c5ec102e1af09e4e94ab157de0408e76eb7c (diff) | |
| download | numpy-16861414438a2fe2b44d86fe1af264fab320cf1a.tar.gz | |
Merge pull request #21321 from felixxm/fix-21317
BUG: Stop using PyBytesObject.ob_shash deprecated in Python 3.11, fixes #21317.
| -rw-r--r-- | numpy/core/src/multiarray/scalarapi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c index 85ef6d3eb..8ed91d26c 100644 --- a/numpy/core/src/multiarray/scalarapi.c +++ b/numpy/core/src/multiarray/scalarapi.c @@ -706,7 +706,9 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) if (PyTypeNum_ISFLEXIBLE(type_num)) { if (type_num == NPY_STRING) { destptr = PyBytes_AS_STRING(obj); - ((PyBytesObject *)obj)->ob_shash = -1; + #if PY_VERSION_HEX < 0x030b00b0 + ((PyBytesObject *)obj)->ob_shash = -1; + #endif memcpy(destptr, data, itemsize); return obj; } |