From 8c975b0fddf0df4172634894f61a7d7c8db48255 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 24 Apr 2025 19:07:00 +0300 Subject: Use os.openpty() instead of pty.openpty() in test_ioctl (GH-132880) pty.openpty() does not work on Android, and it is easier to check availability of os.openpty. --- Lib/test/test_ioctl.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_ioctl.py b/Lib/test/test_ioctl.py index da5b576..b291333 100644 --- a/Lib/test/test_ioctl.py +++ b/Lib/test/test_ioctl.py @@ -9,11 +9,6 @@ from test.support.import_helper import import_module fcntl = import_module('fcntl') termios = import_module('termios') -try: - import pty -except ImportError: - pty = None - class IoctlTestsTty(unittest.TestCase): @classmethod def setUpClass(cls): @@ -136,10 +131,10 @@ class IoctlTestsTty(unittest.TestCase): self.assertRaises(ValueError, self._check_ioctl_not_mutate_len, 2048) -@unittest.skipIf(pty is None, 'pty module required') +@unittest.skipUnless(hasattr(os, 'openpty'), "need os.openpty()") class IoctlTestsPty(unittest.TestCase): def setUp(self): - self.master_fd, self.slave_fd = pty.openpty() + self.master_fd, self.slave_fd = os.openpty() self.addCleanup(os.close, self.slave_fd) self.addCleanup(os.close, self.master_fd) -- cgit v0.12