BUILD: clean out py2 stuff from npy_3kcompat.h #26842
Conversation
| /* | ||
| * This is a renamed copy of the Python non-limited API function _PyLong_AsInt. It is | ||
| * included here because it is missing from the PyPy API. It completes the PyLong_As* | ||
| * group of functions and can be useful in replacing PyInt_Check. |
There was a problem hiding this comment.
PyPy has this function from 7.3.13 released about a year ago
There was a problem hiding this comment.
hehe, and now CPython removed it
| @@ -4702,7 +4702,7 @@ setup_scalartypes(PyObject *NPY_UNUSED(dict)) | |||
| DUAL_INHERIT(CDouble, Complex, ComplexFloating); | |||
| SINGLE_INHERIT(CLongDouble, ComplexFloating); | |||
|
|
|||
| DUAL_INHERIT2(String, String, Character); | |||
| DUAL_INHERIT2(String, Bytes, Character); | |||
There was a problem hiding this comment.
Subtle: this creates a base type inheritance on PyBytesType. The replacement was done previously via #define PyString_Type PyBytes_Type
|
I started looking at #12324, but got distracted by all the cruft in this file. |
dfa6beb to
18170ef
Compare
|
|
||
| /* This is a copy of _PyErr_ChainExceptions | ||
| /* This is a copy of _PyErr_ChainExceptions, which | ||
| * is no longer exported from Python3.12 |
There was a problem hiding this comment.
Seems like this is now _PyErr_ChainExceptions1, but a different thing.
|
If you're reading this because it turns out merging this PR breaks your build for some reason and you don't immediately see how to deal with it (e.g. vendor an old copy of the header), please do let us know in an issue. |
#include "numpy/ndarrayobject.h" but add it where it was missing innumpy/_core/src/multiarray/array_method.c`I will add a release note once I get a PR number