Update to reflect deprecation of the FCNTL module: The fcntl module does

*not* define O_RDWR; get that from the os module.

diff --git a/Lib/pty.py b/Lib/pty.py
index 64d391b63c68994488d533a6165102e1b85628d3..0c203dd612da62d88bcf8ff7eb6fce001cc8cbb8 100644 (file)
--- a/Lib/pty.py
+++ b/Lib/pty.py
@@ -7,7 +7,7 @@
 # Author: Steen Lumholt -- with additions by Guido.
 
 from select import select
-import os, FCNTL
+import os
 import tty
 
 __all__ = ["openpty","fork","spawn"]
@@ -55,7 +55,7 @@ def _open_terminal():
         pass
     else:
         try:
-            tty_name, master_fd = sgi._getpty(FCNTL.O_RDWR, 0666, 0)
+            tty_name, master_fd = sgi._getpty(os.O_RDWR, 0666, 0)
         except IOError, msg:
             raise os.error, msg
         return master_fd, tty_name
@@ -63,7 +63,7 @@ def _open_terminal():
         for y in '0123456789abcdef':
             pty_name = '/dev/pty' + x + y
             try:
-                fd = os.open(pty_name, FCNTL.O_RDWR)
+                fd = os.open(pty_name, os.O_RDWR)
             except os.error:
                 continue
             return (fd, '/dev/tty' + x + y)
@@ -75,7 +75,7 @@ def slave_open(tty_name):
     opened filedescriptor.
     Deprecated, use openpty() instead."""
 
-    return os.open(tty_name, FCNTL.O_RDWR)
+    return os.open(tty_name, os.O_RDWR)
 
 def fork():
     """fork() -> (pid, master_fd)