mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
gh-114328: tty cbreak mode should not alter ICRNL (#114335)
The terminal CR -> NL mapping setting should be inherited in cbreak mode as OSes do not specify altering it as part of their stty cbreak mode definition.
This commit is contained in:
parent
db1c18eb62
commit
fd49e22670
4 changed files with 30 additions and 4 deletions
|
@ -19,7 +19,6 @@ class TestTty(unittest.TestCase):
|
|||
self.addCleanup(termios.tcsetattr, self.fd, termios.TCSAFLUSH, self.mode)
|
||||
|
||||
def check_cbreak(self, mode):
|
||||
self.assertEqual(mode[0] & termios.ICRNL, 0)
|
||||
self.assertEqual(mode[3] & termios.ECHO, 0)
|
||||
self.assertEqual(mode[3] & termios.ICANON, 0)
|
||||
self.assertEqual(mode[6][termios.VMIN], 1)
|
||||
|
@ -56,6 +55,14 @@ class TestTty(unittest.TestCase):
|
|||
self.assertEqual(mode[2], self.mode[2])
|
||||
self.assertEqual(mode[4], self.mode[4])
|
||||
self.assertEqual(mode[5], self.mode[5])
|
||||
mode[tty.IFLAG] |= termios.ICRNL
|
||||
tty.cfmakecbreak(mode)
|
||||
self.assertEqual(mode[tty.IFLAG] & termios.ICRNL, termios.ICRNL,
|
||||
msg="ICRNL should not be cleared by cbreak")
|
||||
mode[tty.IFLAG] &= ~termios.ICRNL
|
||||
tty.cfmakecbreak(mode)
|
||||
self.assertEqual(mode[tty.IFLAG] & termios.ICRNL, 0,
|
||||
msg="ICRNL should not be set by cbreak")
|
||||
|
||||
def test_setraw(self):
|
||||
mode0 = termios.tcgetattr(self.fd)
|
||||
|
@ -74,6 +81,9 @@ class TestTty(unittest.TestCase):
|
|||
self.assertEqual(mode1, mode0)
|
||||
mode2 = termios.tcgetattr(self.fd)
|
||||
self.check_cbreak(mode2)
|
||||
ICRNL = termios.ICRNL
|
||||
self.assertEqual(mode2[tty.IFLAG] & ICRNL, mode0[tty.IFLAG] & ICRNL,
|
||||
msg="ICRNL should not be altered by cbreak")
|
||||
mode3 = tty.setcbreak(self.fd, termios.TCSANOW)
|
||||
self.assertEqual(mode3, mode2)
|
||||
tty.setcbreak(self.stream)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue