diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-07-08 09:19:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 09:19:38 (GMT) |
| commit | a0a6f1167834c87f12e2eca11dd77143103e7691 (patch) | |
| tree | ec5bffb279428b369b0ce55ea763cbe837d2e5df | |
| parent | 1d1c5743400bdf384ec83eb6ba5b39a355d121e3 (diff) | |
| download | cpython-a0a6f1167834c87f12e2eca11dd77143103e7691.zip cpython-a0a6f1167834c87f12e2eca11dd77143103e7691.tar.gz cpython-a0a6f1167834c87f12e2eca11dd77143103e7691.tar.bz2 | |
Revert "bpo-40170: PyType_HasFeature() now always calls PyType_GetFlags() (GH-19378)" (GH-21390)
This partially reverts commit 45ec5b99aefa54552947049086e87ec01bc2fc9a.
(cherry picked from commit b26a0db8ea2de3a8a8e4b40e69fc8642c7d7cb68)
Co-authored-by: Victor Stinner <vstinner@python.org>
| -rw-r--r-- | Include/object.h | 12 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/C API/2020-07-08-10-14-52.bpo-40170.N6Qx1i.rst | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Include/object.h b/Include/object.h index 514d934..9c1a7f4 100644 --- a/Include/object.h +++ b/Include/object.h @@ -618,8 +618,16 @@ times. static inline int -PyType_HasFeature(PyTypeObject *type, unsigned long feature) { - return ((PyType_GetFlags(type) & feature) != 0); +PyType_HasFeature(PyTypeObject *type, unsigned long feature) +{ + unsigned long flags; +#ifdef Py_LIMITED_API + // PyTypeObject is opaque in the limited C API + flags = PyType_GetFlags(type); +#else + flags = type->tp_flags; +#endif + return ((flags & feature) != 0); } #define PyType_FastSubclass(type, flag) PyType_HasFeature(type, flag) diff --git a/Misc/NEWS.d/next/C API/2020-07-08-10-14-52.bpo-40170.N6Qx1i.rst b/Misc/NEWS.d/next/C API/2020-07-08-10-14-52.bpo-40170.N6Qx1i.rst new file mode 100644 index 0000000..760a3ff --- /dev/null +++ b/Misc/NEWS.d/next/C API/2020-07-08-10-14-52.bpo-40170.N6Qx1i.rst @@ -0,0 +1,4 @@ +Revert :c:func:`PyType_HasFeature` change: it reads again directly the +:c:member:`PyTypeObject.tp_flags` member when the limited C API is not used, +rather than always calling :c:func:`PyType_GetFlags` which hides implementation +details. |