8000 gh-133982: Run unclosed file test on all io implementations (gh-134165) · miss-islington/cpython@0b27e08 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0b27e08

Browse files
cmaloneymiss-islington
authored andcommitted
pythongh-133982: Run unclosed file test on all io implementations (pythongh-134165)
Update `test_io` `_check_warn_on_dealloc` to use `self.` to dispatch to different I/O implementations. Update the `_pyio` implementation to match expected behavior, using the same `_dealloc_warn` design as the C implementation uses to report the topmost `__del__` object. The FileIO one now matches all the others, so can use IOBase. There was a missing check on closing (self._fd must be valid), add that check (cherry picked from commit 5b0e827) Co-authored-by: Cody Maloney <cmaloney@users.noreply.github.com>
1 parent 2ffc10b commit 0b27e08

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

Lib/_pyio.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,9 @@ def __del__(self):
407407
if closed:
408408
return
409409

410+
if dealloc_warn := getattr(self, "_dealloc_warn", None):
411+
dealloc_warn(self)
412+
410413
# If close() fails, the caller logs the exception with
411414
# sys.unraisablehook. close() must be called at the end at __del__().
412415
self.close()
@@ -853,6 +856,10 @@ def __repr__(self):
853856
else:
854857
return "<{}.{} name={!r}>".format(modname, clsname, name)
855858

859+
def _dealloc_warn(self, source):
860+
if dealloc_warn := getattr(self.raw, "_dealloc_warn", None):
861+
dealloc_warn(source)
862+
856863
### Lower-level APIs ###
857864

858865
def fileno(self):
@@ -1600,12 +1607,11 @@ def __init__(self, file, mode='r', closefd=True, opener=None):
16001607
raise
16011608
self._fd = fd
16021609

1603-
def __del__(self):
1610+
def _dealloc_warn(self, source):
16041611
if self._fd >= 0 and self._closefd and not self.closed:
16051612
import warnings
1606-
warnings.warn('unclosed file %r' % (self,), ResourceWarning,
1613+
warnings.warn(f'unclosed file {source!r}', ResourceWarning,
16071614
stacklevel=2, source=self)
1608-
self.close()
16091615

16101616
def __getstate__(self):
16111617
raise TypeError(f"cannot pickle {self.__class__.__name__!r} object")
@@ -1780,7 +1786,7 @@ def close(self):
17801786
if not self.closed:
17811787
self._stat_atopen = None
17821788
try:
1783-
if self._closefd:
1789+
if self._closefd and self._fd >= 0:
17841790
os.close(self._fd)
17851791
finally:
17861792
super().close()
@@ -2689,6 +2695,10 @@ def readline(self, size=None):
26892695
def newlines(self):
26902696
return self._decoder.newlines if self._decoder else None
26912697

2698+
def _dealloc_warn(self, source):
2699+
if dealloc_warn := getattr(self.buffer, "_dealloc_warn", None):
2700+
dealloc_warn(source)
2701+
26922702

26932703
class StringIO(TextIOWrapper):
26942704
"""Text I/O implementation using an in-memory buffer.

Lib/test/test_io.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4417,7 +4417,7 @@ def test_abc_inheritance_official(self):
44174417
self._check_abc_inheritance(io)
44184418

44194419
def _check_warn_on_dealloc(self, *args, **kwargs):
4420-
f = open(*args, **kwargs)
4420+
f = self.open(*args, **kwargs)
44214421
r = repr(f)
44224422
with self.assertWarns(ResourceWarning) as cm:
44234423
f = None
@@ -4446,7 +4446,7 @@ def cleanup_fds():
44464446
r, w = os.pipe()
44474447
fds += r, w
44484448
with warnings_helper.check_no_resource_warning(self):
4449-
open(r, *args, closefd=False, **kwargs)
4449+
self.open(r, *args, closefd=False, **kwargs)
44504450

44514451
@unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
44524452
def test_warn_on_dealloc_fd(self):
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Emit :exc:`RuntimeWarning` in the Python implementation of :mod:`io` when
2+
the :term:`file-like object <file object>` is not closed explicitly in the
3+
presence of multiple I/O layers.

0 commit comments

Comments
 (0)
0