Skip to content

bpo-45383: Inherit MetaClass from bases in FromSpec API #28748

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
encukou merged 19 commits into from
Jun 9, 2022
Merged

bpo-45383: Inherit MetaClass from bases in FromSpec API #28748

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
67c8a97
BUG: Inherit MetaClass from bases in FromSpec API
seberg Oct 5, 2021
2012aaa
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 5, 2021
881ba13
MAINT: Address review comments
seberg Oct 20, 2021
6fd1926
Merge in the main branch
encukou May 27, 2022
aad7456
Disallow non-type metaclasses
encukou May 27, 2022
aba4208
Use custom metaclasses for the tests, rather than stuff from ctypes
encukou May 27, 2022
4eb003a
Make PyType_FromMetaclass refcounting easier to follow
encukou May 27, 2022
1ae7969
Adjust documentation
encukou May 27, 2022
6001a33
Fix type warning
encukou May 31, 2022
1ad0eca
Remove unused includes from _testcapimodule.c
encukou May 31, 2022
ea69819
Use an explicit role in the News entry
encukou May 31, 2022
cb1527f
Test that __subclasses__ is updated properly
encukou May 31, 2022
f86d2b5
Document caveats, suggest that PyType_From* is not for user-provided …
encukou May 31, 2022
93c65e8
Remove unused variable
encukou May 31, 2022
d881750
Move bases calculation before the allocation
encukou May 31, 2022
a7af972
Fix compiler warning for Py_NewRef result
encukou Jun 1, 2022
2f47be3
Use PyErr_Occurred rather than a variable
encukou Jun 9, 2022
ef6bcce
Use PEP 7 style
encukou Jun 9, 2022
6b31880
Replace duplicate Py_TPFLAGS_BASETYPE check with an assert
encukou Jun 9, 2022
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
Prev Previous commit
Replace duplicate Py_TPFLAGS_BASETYPE check with an assert
  • Loading branch information
@encukou
encukou committed Jun 9, 2022
commit 6b31880cf77b079386844e9d3a43cdcc712d3264
9 changes: 3 additions & 6 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3485,12 +3485,9 @@ PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
if (base == NULL) {
goto finally;
}
if (!_PyType_HasFeature(base, Py_TPFLAGS_BASETYPE)) {
PyErr_Format(PyExc_TypeError,
"type '%.100s' is not an acceptable base type",
base->tp_name);
goto finally;
}
// best_base should check Py_TPFLAGS_BASETYPE & raise a proper exception,
// here we just check its work
assert(_PyType_HasFeature(base, Py_TPFLAGS_BASETYPE));

/* Allocate the new type */

Expand Down