Okay, so the change is straightforward. With this change the entire test suite passes on my machine.

We'll need a test for this for the test suite, and that's far less straightforward. It seems that test.test_builtin.BuiltinTest.check_input_tty() could be a starting point. Could someone come up with a working test for this?