Skip to content

gh-101819: Refactor _io in preparation for module isolation #104334

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 12 commits into from
May 9, 2023
Merged

gh-101819: Refactor _io in preparation for module isolation #104334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
14f923e
Refactor: replace query with parameter
erlend-aasland May 9, 2023
482f134
Refactor: replace query with parameter
erlend-aasland May 9, 2023
8adc0cd
Refactor: hide delegate
erlend-aasland May 9, 2023
703440a
Refactor: hide delegate
erlend-aasland May 9, 2023
ea9c098
Refactor: hide delegate
erlend-aasland May 9, 2023
e940ed3
Add io state struct forward declaration.
erlend-aasland May 9, 2023
c68d657
Refactor: replace query with parameter
erlend-aasland May 9, 2023
0084715
Refactor: replace query with parameter
erlend-aasland May 9, 2023
20777e7
Refactor: replace query with parameter
erlend-aasland May 9, 2023
b22b41d
Fetch state by module def in _io__Buffered_seek_impl()
erlend-aasland May 9, 2023
0044293
Address review: improve forward decl. of _PyIO_State
erlend-aasland May 9, 2023
7aa8da7
Address review: remove second typedef
erlend-aasland May 9, 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
Prev Previous commit
Next Next commit
Refactor: replace query with parameter 
Pass module state to _PyIOBase_check_readable()
  • Loading branch information
@erlend-aasland
erlend-aasland committed May 9, 2023
commit 0084715e00725c660a796c15cc7f8710ab8061db
3 changes: 2 additions & 1 deletion Modules/_io/_iomodule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ extern PyType_Spec winconsoleio_spec;
* BUT when args=Py_True is passed, they return a borrowed reference.
*/
struct _io_state; // Forward decl.
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
extern PyObject* _PyIOBase_check_readable(PyObject *self, PyObject *args);
extern PyObject* _PyIOBase_check_readable(struct _io_state *state,
PyObject *self, PyObject *args);
extern PyObject* _PyIOBase_check_writable(PyObject *self, PyObject *args);
extern PyObject* _PyIOBase_check_seekable(struct _io_state *state,
PyObject *self, PyObject *args);
Expand Down
13 changes: 8 additions & 5 deletions Modules/_io/bufferedio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,8 +1424,10 @@ _io_BufferedReader___init___impl(buffered *self, PyObject *raw,
self->ok = 0;
self->detached = 0;

if (_PyIOBase_check_readable(raw, Py_True) == NULL)
_PyIO_State *state = find_io_state_by_def(Py_TYPE(self));
if (_PyIOBase_check_readable(state, raw, Py_True) == NULL) {
return -1;
}

Py_XSETREF(self->raw, Py_NewRef(raw));
self->buffer_size = buffer_size;
Expand All @@ -1436,7 +1438,6 @@ _io_BufferedReader___init___impl(buffered *self, PyObject *raw,
return -1;
_bufferedreader_reset_buf(self);

_PyIO_State *state = find_io_state_by_def(Py_TYPE(self));
self->fast_closed_checks = (
Py_IS_TYPE(self, state->PyBufferedReader_Type) &&
Py_IS_TYPE(raw, state->PyFileIO_Type)
Expand Down Expand Up @@ -2097,12 +2098,13 @@ _io_BufferedRWPair___init___impl(rwpair *self, PyObject *reader,
PyObject *writer, Py_ssize_t buffer_size)
/*[clinic end generated code: output=327e73d1aee8f984 input=620d42d71f33a031]*/
{
if (_PyIOBase_check_readable(reader, Py_True) == NULL)
_PyIO_State *state = find_io_state_by_def(Py_TYPE(self));
if (_PyIOBase_check_readable(state, reader, Py_True) == NULL) {
return -1;
}
if (_PyIOBase_check_writable(writer, Py_True) == NULL)
return -1;

_PyIO_State *state = find_io_state_by_def(Py_TYPE(self));
self->reader = (buffered *) PyObject_CallFunction(
(PyObject *)state->PyBufferedReader_Type,
"On", reader, buffer_size);
Expand Down Expand Up @@ -2299,8 +2301,9 @@ _io_BufferedRandom___init___impl(buffered *self, PyObject *raw,
if (_PyIOBase_check_seekable(state, raw, Py_True) == NULL) {
return -1;
}
if (_PyIOBase_check_readable(raw, Py_True) == NULL)
if (_PyIOBase_check_readable(state, raw, Py_True) == NULL) {
return -1;
}
if (_PyIOBase_check_writable(raw, Py_True) == NULL)
return -1;

Expand Down
6 changes: 3 additions & 3 deletions Modules/_io/iobase.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ iobase_check_seekable(PyObject *self, PyObject *args)
static PyObject *
iobase_check_readable(PyObject *self, PyObject *args)
{
return _PyIOBase_check_readable(self, args);
_PyIO_State *state = IO_STATE();
return _PyIOBase_check_readable(state, self, args);
}

static PyObject *
Expand Down Expand Up @@ -424,14 +425,13 @@ _io__IOBase_readable_impl(PyObject *self)

/* May be called with any object */
PyObject *
_PyIOBase_check_readable(PyObject *self, PyObject *args)
_PyIOBase_check_readable(_PyIO_State *state, PyObject *self, PyObject *args)
{
PyObject *res = PyObject_CallMethodNoArgs(self, &_Py_ID(readable));
if (res == NULL)
return NULL;
if (res != Py_True) {
Py_CLEAR(res);
_PyIO_State *state = IO_STATE();
iobase_unsupported(state, "File or stream is not readable.");
return NULL;
}
Expand Down