Skip to content

Commit

Permalink
bpo-44687: Ensure BufferedReader objects with unread buffers can peek…
Browse files Browse the repository at this point in the history
… even when the underlying file is closed (GH-28457)

(cherry picked from commit a450398)

Co-authored-by: AngstyDuck <solsticedante@gmail.com>
  • Loading branch information
miss-islington and AngstyDuck committed Oct 1, 2021
1 parent 6df8c32 commit 2221207
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
@@ -0,0 +1 @@
:meth:`BufferedReader.peek` no longer raises :exc:`ValueError` when the entire file has already been buffered.
8 changes: 5 additions & 3 deletions Modules/_io/bufferedio.c
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 2221207

Please sign in to comment.