Skip to content

gh-101819: Remove _testcapi dependencies on specific _io symbols #101918

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
erlend-aasland merged 2 commits into from
Feb 15, 2023
Merged

gh-101819: Remove _testcapi dependencies on specific _io symbols #101918

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
692403d
gh-101819: Remove _testcapi dependencies on specific _io symbols
erlend-aasland Feb 14, 2023
7ca285f
Cast
erlend-aasland Feb 14, 2023
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
Next Next commit
gh-101819: Remove _testcapi dependencies on specific _io symbols
  • Loading branch information
@erlend-aasland
erlend-aasland committed Feb 14, 2023
commit 692403d8c401d3bea885e16396c57ba602b59de4
12 changes: 2 additions & 10 deletions Modules/_io/_iomodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,16 +720,8 @@ PyInit__io(void)
// Add types
for (size_t i=0; i < Py_ARRAY_LENGTH(static_types); i++) {
PyTypeObject *type = static_types[i];
// Private type not exposed in the _io module
if (type == &_PyBytesIOBuffer_Type) {
if (PyType_Ready(type) < 0) {
goto fail;
}
}
else {
if (PyModule_AddType(m, type) < 0) {
goto fail;
}
if (PyModule_AddType(m, type) < 0) {
goto fail;
}
}

Expand Down
7 changes: 5 additions & 2 deletions Modules/_testcapimodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,12 +1448,10 @@ test_from_contiguous(PyObject* self, PyObject *Py_UNUSED(ignored))
}

#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__GNUC__)
extern PyTypeObject _PyBytesIOBuffer_Type;

static PyObject *
test_pep3118_obsolete_write_locks(PyObject* self, PyObject *Py_UNUSED(ignored))
{
PyTypeObject *type = &_PyBytesIOBuffer_Type;
PyObject *b;
char *dummy[1];
int ret, match;
Expand All @@ -1466,7 +1464,12 @@ test_pep3118_obsolete_write_locks(PyObject* self, PyObject *Py_UNUSED(ignored))
goto error;

/* bytesiobuf_getbuffer() */
PyTypeObject *type = _PyImport_GetModuleAttrString("_io", "_BytesIOBuffer");
if (type == NULL) {
return NULL;
}
b = type->tp_alloc(type, 0);
Py_DECREF(type);
if (b == NULL) {
return NULL;
}
Expand Down