commit 6c611fae53eeb2e4e5c2db4fc634779fbcdf33eb
author Martin v. Löwis <martin@v.loewis.de> Sun Jul 28 09:42:57 2002 +0000
committer Martin v. Löwis <martin@v.loewis.de> Sun Jul 28 09:42:57 2002 +0000
tree b68bdbdbd3d832aadf493fcb7955e45bf2dcbf68
parent d694c1faf9314c9c531db59d24f90223cf720583

Patch #581705: Catch OSError, termios.error in spawn. 2.2 bugfix candidate.

Lib/pty.py

diff --git a/Lib/pty.py b/Lib/pty.py
index a2f21c9..a08aa1b 100644
--- a/Lib/pty.py
+++ b/Lib/pty.py
@@ -154,9 +154,14 @@
     pid, master_fd = fork()
     if pid == CHILD:
         apply(os.execlp, (argv[0],) + argv)
-    mode = tty.tcgetattr(STDIN_FILENO)
-    tty.setraw(STDIN_FILENO)
+    try:
+        mode = tty.tcgetattr(STDIN_FILENO)
+        tty.setraw(STDIN_FILENO)
+        restore = 1
+    except tty.error:    # This is the same as termios.error
+        restore = 0
     try:
         _copy(master_fd, master_read, stdin_read)
-    except IOError:
-        tty.tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)
+    except (IOError, OSError):
+        if restore:
+            tty.tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)