Skip to content

Commit 3c79c75

Browse files
committed
No dup at all
1 parent f85412e commit 3c79c75

2 files changed

Lines changed: 6 additions & 37 deletions

File tree

‎Lib/_pyrepl/readline.py‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -349,29 +349,15 @@ def do(self) -> None:
349349

350350
@dataclass(slots=True)
351351
class _ReadlineWrapper:
352-
f_in: int = -1
353-
f_out: int = -1
352+
f_in: int = 0
353+
f_out: int = 1
354354
reader: ReadlineAlikeReader | None = field(default=None, repr=False)
355355
saved_history_length: int = -1
356356
startup_hook: Callback | None = None
357357
config: ReadlineConfig = field(default_factory=ReadlineConfig, repr=False)
358-
owned_fds: list[int] = field(default_factory=list, init=False, repr=False)
359-
360-
def __del__(self, _close=os.close) -> None:
361-
for fd in self.owned_fds:
362-
try:
363-
_close(fd)
364-
except OSError:
365-
pass
366358

367359
def get_reader(self) -> ReadlineAlikeReader:
368360
if self.reader is None:
369-
if self.f_in == -1:
370-
self.f_in = os.dup(0)
371-
self.owned_fds.append(self.f_in)
372-
if self.f_out == -1:
373-
self.f_out = os.dup(1)
374-
self.owned_fds.append(self.f_out)
375361
console = Console(self.f_in, self.f_out, encoding=ENCODING)
376362
self.reader = ReadlineAlikeReader(console=console, config=self.config)
377363
return self.reader

‎Lib/test/test_pyrepl/test_pyrepl.py‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
captured_stdout,
2121
captured_stderr,
2222
force_not_colorized,
23-
gc_collect,
2423
make_clean_env,
2524
Py_DEBUG,
2625
)
@@ -2728,36 +2727,20 @@ def test_exact_width_line_does_not_wrap(self):
27282727

27292728
@skipUnless(pty, "requires pty")
27302729
class TestReadlineWrapperFileDescriptors(TestCase):
2731-
def setUp(self):
2732-
controller, self.worker = pty.openpty()
2730+
def test_reader_does_not_open_file_descriptors(self):
2731+
controller, worker = pty.openpty()
27332732
self.addCleanup(os.close, controller)
2734-
self.addCleanup(os.close, self.worker)
2733+
self.addCleanup(os.close, worker)
27352734
env = self.enterContext(EnvironmentVarGuard())
27362735
env["TERM"] = "ansi"
2737-
2738-
def redirect_stdio_to_pty(self):
27392736
sys.stdout.flush()
27402737
for fd in (0, 1):
27412738
saved = os.dup(fd)
27422739
self.addCleanup(os.close, saved)
27432740
self.addCleanup(os.dup2, saved, fd)
2744-
os.dup2(self.worker, fd)
2741+
os.dup2(worker, fd)
27452742

2746-
def test_dupped_fds_are_closed_with_wrapper(self):
2747-
self.redirect_stdio_to_pty()
27482743
before = fd_count()
27492744
wrapper = _ReadlineWrapper()
2750-
self.assertEqual(fd_count(), before)
2751-
wrapper.get_reader()
2752-
self.assertEqual(fd_count(), before + 2)
2753-
del wrapper
2754-
gc_collect()
2755-
self.assertEqual(fd_count(), before)
2756-
2757-
def test_given_fds_are_not_closed_with_wrapper(self):
2758-
before = fd_count()
2759-
wrapper = _ReadlineWrapper(f_in=self.worker, f_out=self.worker)
27602745
wrapper.get_reader()
2761-
del wrapper
2762-
gc_collect()
27632746
self.assertEqual(fd_count(), before)

0 commit comments

Comments
 (0)