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

6c611fae · Martin v. Löwis · d694c1fa · 6c611fae
Commit 6c611fae authored Jul 28, 2002 by Martin v. Löwis
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

Lib/pty.py Lib/pty.py +9 -4

No files found.
--- a/Lib/pty.py
+++ b/Lib/pty.py
@@ -154,9 +154,14 @@ def spawn(argv, master_read=_read, stdin_read=_read):
    pid, master_fd = fork()
    if pid == CHILD:
        apply(os.execlp, (argv[0],) + argv)
-    mode = tty.tcgetattr(STDIN_FILENO)
+    try:
-    tty.setraw(STDIN_FILENO)
+        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:
+    except (IOError, OSError):
-        tty.tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)
+        if restore:
+            tty.tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)