Skip to content

gh-93466: Document PyType_Spec doesn't accept repeated slot IDs; raise where this was problematic #93471

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 4 commits into from
Jun 10, 2022
Merged

gh-93466: Document PyType_Spec doesn't accept repeated slot IDs; raise where this was problematic #93471

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d49b4f8
Document PyType_Spec doesn't accept repeated slot IDs; raise where th…
encukou Jun 3, 2022
b87b1f2
Add blurb
encukou Jun 3, 2022
4e1acf6
Merge main branch & fix conflict
encukou Jun 9, 2022
d115147
Use RuntimeError
encukou Jun 10, 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
Use RuntimeError
  • Loading branch information
@encukou
encukou committed Jun 10, 2022
commit d115147bf3577ae6051e4df4692a887e42b9f325
2 changes: 1 addition & 1 deletion Lib/test/test_capi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ def test_heaptype_with_custom_metaclass(self):
def test_pytype_fromspec_with_repeated_slots(self):
for variant in range(2):
with self.subTest(variant=variant):
with self.assertRaises(RuntimeError):
with self.assertRaises(SystemError):
_testcapi.create_type_from_repeated_slots(variant)

def test_pynumber_tobase(self):
Expand Down
4 changes: 2 additions & 2 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3419,7 +3419,7 @@ PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
if (slot->slot == Py_tp_members) {
if (nmembers != 0) {
PyErr_SetString(
PyExc_RuntimeError,
PyExc_SystemError,
"Multiple Py_tp_members slots are not supported.");
return NULL;
}
Expand Down Expand Up @@ -3567,7 +3567,7 @@ PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
literal, we need to make a copy */
if (type->tp_doc != NULL) {
PyErr_SetString(
PyExc_RuntimeError,
PyExc_SystemError,
"Multiple Py_tp_doc slots are not supported.");
return NULL;
}
Expand Down