Skip to content

bpo-37054, _pyio: Fix BytesIO and TextIOWrapper __del__() #13601

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
vstinner merged 1 commit into from
May 27, 2019
Merged

bpo-37054, _pyio: Fix BytesIO and TextIOWrapper __del__() #13601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion Lib/_pyio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,10 @@ class BytesIO(BufferedIOBase):

"""Buffered I/O implementation using an in-memory bytes buffer."""

# Initialize _buffer as soon as possible since it's used by __del__()
# which calls close()
_buffer = None

def __init__(self, initial_bytes=None):
buf = bytearray()
if initial_bytes is not None:
Expand Down Expand Up @@ -900,7 +904,8 @@ def getbuffer(self):
return memoryview(self._buffer)

def close(self):
self._buffer.clear()
if self._buffer is not None:
self._buffer.clear()
super().close()

def read(self, size=-1):
Expand Down Expand Up @@ -1970,6 +1975,10 @@ class TextIOWrapper(TextIOBase):

_CHUNK_SIZE = 2048

# Initialize _buffer as soon as possible since it's used by __del__()
# which calls close()
_buffer = None

# The write_through argument has no effect here since this
# implementation always writes through. The argument is present only
# so that the signature can match the signature of the C version.
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2019-05-28-01-06-44.bpo-37054.sLULGQ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix destructor :class:`_pyio.BytesIO` and :class:`_pyio.TextIOWrapper`:
initialize their ``_buffer`` attribute as soon as possible (in the class
body), because it's used by ``__del__()`` which calls ``close()``.