mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

[3.12] gh-117482: Fix the Slot Wrapper Inheritance Tests (gh-122250)

Browse source 
The tests were only checking cases where the slot wrapper was present in the initial case.  They were missing when the slot wrapper was added in the additional initializations.  This fixes that.

(cherry-picked from commit 490e0ad83a, AKA gh-122248)
This commit is contained in:
Eric Snow 2024-07-29 10:25:17 -06:00 • committed by GitHub
parent e29910447b
commit 5bd2ea2b94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 129 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Objects/typeobject.c
View file

@ -10094,7 +10094,25 @@ expect_manually_inherited(PyTypeObject *type, void **slot)
&& typeobj != PyExc_StopIteration
&& typeobj != PyExc_SyntaxError
&& typeobj != PyExc_UnicodeDecodeError
&& typeobj != PyExc_UnicodeEncodeError)
&& typeobj != PyExc_UnicodeEncodeError
&& type != &PyBool_Type
&& type != &PyBytes_Type
&& type != &PyMemoryView_Type
&& type != &PyComplex_Type
&& type != &PyEnum_Type
&& type != &PyFilter_Type
&& type != &PyFloat_Type
&& type != &PyFrozenSet_Type
&& type != &PyLong_Type
&& type != &PyMap_Type
&& type != &PyRange_Type
&& type != &PyReversed_Type
&& type != &PySlice_Type
&& type != &PyTuple_Type
&& type != &PyUnicode_Type
&& type != &PyZip_Type)
{
return 1;
}
@ -10112,10 +10130,8 @@ expect_manually_inherited(PyTypeObject *type, void **slot)
/* This is a best-effort list of builtin types
that have their own tp_getattr function. */
if (typeobj == PyExc_BaseException
|| type == &PyBool_Type
|| type == &PyByteArray_Type
|| type == &PyBytes_Type
|| type == &PyClassMethod_Type
|| type == &PyComplex_Type
|| type == &PyDict_Type
|| type == &PyEnum_Type
@ -10129,7 +10145,6 @@ expect_manually_inherited(PyTypeObject *type, void **slot)
|| type == &PyReversed_Type
|| type == &PySet_Type
|| type == &PySlice_Type
|| type == &PyStaticMethod_Type
|| type == &PySuper_Type
|| type == &PyTuple_Type
|| type == &PyZip_Type)