[3.12] gh-114328: tty cbreak mode should not alter ICRNL (GH-114335) by miss-islington · Pull Request #114410 · python/cpython · GitHub
Skip to content

[3.12] gh-114328: tty cbreak mode should not alter ICRNL (GH-114335) #114410

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
gpshead merged 1 commit into from
Jan 21, 2024
Merged

[3.12] gh-114328: tty cbreak mode should not alter ICRNL (GH-114335) #114410

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
15 changes: 15 additions & 0 deletions Doc/library/tty.rst
View file
Open in desktop
12 changes: 11 additions & 1 deletion Lib/test/test_tty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ def setUp(self):
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)
Expand Down Expand Up @@ -56,6 +55,14 @@ def test_cfmakecbreak(self):
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)
Expand All @@ -74,6 +81,9 @@ def test_setcbreak(self):
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)
Expand Down
3 changes: 0 additions & 3 deletions Lib/tty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ def cfmakeraw(mode):

def cfmakecbreak(mode):
"""Make termios mode cbreak."""
# Do not map CR to NL on input.
mode[IFLAG] &= ~(ICRNL)

# Do not echo characters; disable canonical input.
mode[LFLAG] &= ~(ECHO | ICANON)

Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2024-01-19-15-48-06.gh-issue-114328.hixxW3.rst
View file
Open in desktop