Commit 9467dfaa authored by Fred Drake's avatar Fred Drake

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

*not* define O_RDWR; get that from the os module.
parent ef5b1e78
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# Author: Steen Lumholt -- with additions by Guido. # Author: Steen Lumholt -- with additions by Guido.
from select import select from select import select
import os, FCNTL import os
import tty import tty
__all__ = ["openpty","fork","spawn"] __all__ = ["openpty","fork","spawn"]
...@@ -55,7 +55,7 @@ def _open_terminal(): ...@@ -55,7 +55,7 @@ def _open_terminal():
pass pass
else: else:
try: 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: except IOError, msg:
raise os.error, msg raise os.error, msg
return master_fd, tty_name return master_fd, tty_name
...@@ -63,7 +63,7 @@ def _open_terminal(): ...@@ -63,7 +63,7 @@ def _open_terminal():
for y in '0123456789abcdef': for y in '0123456789abcdef':
pty_name = '/dev/pty' + x + y pty_name = '/dev/pty' + x + y
try: try:
fd = os.open(pty_name, FCNTL.O_RDWR) fd = os.open(pty_name, os.O_RDWR)
except os.error: except os.error:
continue continue
return (fd, '/dev/tty' + x + y) return (fd, '/dev/tty' + x + y)
...@@ -75,7 +75,7 @@ def slave_open(tty_name): ...@@ -75,7 +75,7 @@ def slave_open(tty_name):
opened filedescriptor. opened filedescriptor.
Deprecated, use openpty() instead.""" Deprecated, use openpty() instead."""
return os.open(tty_name, FCNTL.O_RDWR) return os.open(tty_name, os.O_RDWR)
def fork(): def fork():
"""fork() -> (pid, master_fd) """fork() -> (pid, master_fd)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment