diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-10-01 20:46:25 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 20:46:25 (GMT) |
| commit | 6035d650a322cec9619b306af2a877f3cead1580 (patch) | |
| tree | ecad746e2a025c94c0c1c6b7d7cdaf4f835155b4 | |
| parent | 0e1aeab5d7de3f328876aea8ccabbc6db146a883 (diff) | |
| download | cpython-6035d650a322cec9619b306af2a877f3cead1580.zip cpython-6035d650a322cec9619b306af2a877f3cead1580.tar.gz cpython-6035d650a322cec9619b306af2a877f3cead1580.tar.bz2 | |
bpo-44687: Ensure BufferedReader objects with unread buffers can peek even when the underlying file is closed (GH-28457)
Co-authored-by: AngstyDuck <solsticedante@gmail.com>
| -rw-r--r-- | Misc/NEWS.d/next/C API/2021-09-19-17-18-25.bpo-44687.3fqDRC.rst | 1 | ||||
| -rw-r--r-- | Modules/_io/bufferedio.c | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Misc/NEWS.d/next/C API/2021-09-19-17-18-25.bpo-44687.3fqDRC.rst b/Misc/NEWS.d/next/C API/2021-09-19-17-18-25.bpo-44687.3fqDRC.rst new file mode 100644 index 0000000..d38fa60 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2021-09-19-17-18-25.bpo-44687.3fqDRC.rst @@ -0,0 +1 @@ +:meth:`BufferedReader.peek` no longer raises :exc:`ValueError` when the entire file has already been buffered. diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index f8e21f2..b0fe9e4 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -341,11 +341,10 @@ _enter_buffered_busy(buffered *self) : buffered_closed(self))) #define CHECK_CLOSED(self, error_msg) \ - if (IS_CLOSED(self)) { \ + if (IS_CLOSED(self) & (Py_SAFE_DOWNCAST(READAHEAD(self), Py_off_t, Py_ssize_t) == 0)) { \ PyErr_SetString(PyExc_ValueError, error_msg); \ return NULL; \ - } - + } \ #define VALID_READ_BUFFER(self) \ (self->readable && self->read_end != -1) @@ -530,6 +529,9 @@ buffered_close(buffered *self, PyObject *args) Py_CLEAR(res); } + self->read_end = 0; + self->pos = 0; + end: LEAVE_BUFFERED(self) return res; |