Update _run_cmdfinalization_hooks to use termios instead of suprocess('stty sane')

Author: tleonhardt

cmd2/cmd2.py

@@ -513,12 +513,13 @@ def __init__(
         self._initial_termios_settings = None
         if not sys.platform.startswith('win') and self.stdin.isatty():
             try:
+                import io
                 import termios
 
                 self._initial_termios_settings = termios.tcgetattr(self.stdin.fileno())
-            except (ImportError, termios.error):
+            except (ImportError, io.UnsupportedOperation, termios.error):
                 # This can happen if termios isn't available or stdin is a pseudo-TTY
-                pass
+                self._initial_termios_settings = None
 
         # If a startup script is provided and exists, then execute it in the startup commands
         if startup_script:
@@ -2834,14 +2835,15 @@ def onecmd_plus_hooks(
 
     def _run_cmdfinalization_hooks(self, stop: bool, statement: Statement | None) -> bool:
         """Run the command finalization hooks."""
-        with self.sigint_protection:
-            if not sys.platform.startswith('win') and self.stdin.isatty():
-                # Before the next command runs, fix any terminal problems like those
-                # caused by certain binary characters having been printed to it.
-                import subprocess
-
-                proc = subprocess.Popen(['stty', 'sane'])  # noqa: S607
-                proc.communicate()
+        if self._initial_termios_settings is not None and self.stdin.isatty():
+            import io
+            import termios
+
+            # Before the next command runs, fix any terminal problems like those
+            # caused by certain binary characters having been printed to it.
+            with self.sigint_protection, contextlib.suppress(io.UnsupportedOperation, termios.error):
+                # This can fail if stdin is a pseudo-TTY, in which case we just ignore it
+                termios.tcsetattr(self.stdin.fileno(), termios.TCSANOW, self._initial_termios_settings)
 
         data = plugin.CommandFinalizationData(stop, statement)
         for func in self._cmdfinalization_hooks:

tests/test_cmd2.py

@@ -1068,16 +1068,14 @@ def test_cmdloop_without_rawinput() -> None:
     assert out == expected
 
 
-@pytest.mark.skipif(sys.platform.startswith('win'), reason="stty sane only run on Linux/Mac")
-def test_stty_sane(base_app, monkeypatch) -> None:
-    """Make sure stty sane is run on Linux/Mac after each command if stdin is a terminal"""
+def test_cmdfinalizations_runs(base_app, monkeypatch) -> None:
+    """Make sure _run_cmdfinalization_hooks is run on after each command."""
     with mock.patch('sys.stdin.isatty', mock.MagicMock(name='isatty', return_value=True)):
-        # Mock out the subprocess.Popen call so we don't actually run stty sane
-        m = mock.MagicMock(name='Popen')
-        monkeypatch.setattr("subprocess.Popen", m)
+        m = mock.MagicMock(name='cmdfinalization')
+        monkeypatch.setattr("cmd2.Cmd._run_cmdfinalization_hooks", m)
 
         base_app.onecmd_plus_hooks('help')
-        m.assert_called_once_with(['stty', 'sane'])
+        m.assert_called_once()
 
 
 def test_sigint_handler(base_app) -> None: