Skip to content

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

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
merged 11 commits into from
May 11, 2023
Merged

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

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0bfd278
Refactor: replace query with parameter
erlend-aasland May 10, 2023
8196135
Fetch module state by class in _io.FileIO.readinto
erlend-aasland May 10, 2023
9584041
Fetch module state by class in _io.FileIO.read
erlend-aasland May 10, 2023
097f147
Fetch module state by class in _io.FileIO.write
erlend-aasland May 10, 2023
c4e0940
Fetch module state by class in _io.FileIO.truncate
erlend-aasland May 10, 2023
7f34d0a
Refactor: replace query with parameter
erlend-aasland May 10, 2023
cc1c8f8
Fetch module state by class in _WindowsConsoleIO.close
erlend-aasland May 10, 2023
0b3d502
Refactor: replace query with parameter
erlend-aasland May 10, 2023
c07026f
Refactor: change function declaration
erlend-aasland May 10, 2023
6fbda70
Refactor: replace query with parameter
erlend-aasland May 10, 2023
50399ab
Fetch module state by class where possible in winconsoleio.c
erlend-aasland May 10, 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
Refactor: replace query with parameter 
Pass module state as parameter to err_mode()
  • Loading branch information
@erlend-aasland
erlend-aasland committed May 10, 2023
commit 0bfd278b80506ef796276b1dc117cb93308b6812
33 changes: 19 additions & 14 deletions Modules/_io/fileio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,13 +549,10 @@ err_closed(void)
}

static PyObject *
err_mode(const char *action)
err_mode(_PyIO_State *state, const char *action)
{
_PyIO_State *state = IO_STATE();
if (state != NULL)
PyErr_Format(state->unsupported_operation,
"File not open for %s", action);
return NULL;
return PyErr_Format(state->unsupported_operation,
"File not open for %s", action);
}

/*[clinic input]
Expand Down Expand Up @@ -646,8 +643,10 @@ _io_FileIO_readinto_impl(fileio *self, Py_buffer *buffer)

if (self->fd < 0)
return err_closed();
if (!self->readable)
return err_mode("reading");
if (!self->readable) {
_PyIO_State *state = IO_STATE();
return err_mode(state, "reading");
}

n = _Py_read(self->fd, buffer->buf, buffer->len);
/* copy errno because PyBuffer_Release() can indirectly modify it */
Expand Down Expand Up @@ -804,8 +803,10 @@ _io_FileIO_read_impl(fileio *self, Py_ssize_t size)

if (self->fd < 0)
return err_closed();
if (!self->readable)
return err_mode("reading");
if (!self->readable) {
_PyIO_State *state = IO_STATE();
return err_mode(state, "reading");
}

if (size < 0)
return _io_FileIO_readall_impl(self);
Expand Down Expand Up @@ -862,8 +863,10 @@ _io_FileIO_write_impl(fileio *self, Py_buffer *b)

if (self->fd < 0)
return err_closed();
if (!self->writable)
return err_mode("writing");
if (!self->writable) {
_PyIO_State *state = IO_STATE();
return err_mode(state, "writing");
}

n = _Py_write(self->fd, b->buf, b->len);
/* copy errno because PyBuffer_Release() can indirectly modify it */
Expand Down Expand Up @@ -1014,8 +1017,10 @@ _io_FileIO_truncate_impl(fileio *self, PyObject *posobj)
fd = self->fd;
if (fd < 0)
return err_closed();
if (!self->writable)
return err_mode("writing");
if (!self->writable) {
_PyIO_State *state = IO_STATE();
return err_mode(state, "writing");
}

if (posobj == Py_None) {
/* Get the current position. */
Expand Down