Commit b6f15187 authored by Guido van Rossum's avatar Guido van Rossum

Add optional bufsize argument to various calls so we can make the

os.fdopen() calls unbuffered.  I presume that it's enough if we can
make all three of them (for stdin, stdout, and stderr) unbuffered and
don't need to specify different buffer sizes per file -- that would
complicate the interface more than I care for.
parent 031b30f1
...@@ -11,7 +11,7 @@ def _cleanup(): ...@@ -11,7 +11,7 @@ def _cleanup():
inst.poll() inst.poll()
class Popen3: class Popen3:
def __init__(self, cmd, capturestderr=0): def __init__(self, cmd, capturestderr=0, bufsize=-1):
if type(cmd) == type(''): if type(cmd) == type(''):
cmd = ['/bin/sh', '-c', cmd] cmd = ['/bin/sh', '-c', cmd]
p2cread, p2cwrite = os.pipe() p2cread, p2cwrite = os.pipe()
...@@ -41,12 +41,12 @@ class Popen3: ...@@ -41,12 +41,12 @@ class Popen3:
# Shouldn't come here, I guess # Shouldn't come here, I guess
os._exit(1) os._exit(1)
os.close(p2cread) os.close(p2cread)
self.tochild = os.fdopen(p2cwrite, 'w') self.tochild = os.fdopen(p2cwrite, 'w', bufsize)
os.close(c2pwrite) os.close(c2pwrite)
self.fromchild = os.fdopen(c2pread, 'r') self.fromchild = os.fdopen(c2pread, 'r', bufsize)
if capturestderr: if capturestderr:
os.close(errin) os.close(errin)
self.childerr = os.fdopen(errout, 'r') self.childerr = os.fdopen(errout, 'r', bufsize)
else: else:
self.childerr = None self.childerr = None
self.sts = -1 # Child not completed yet self.sts = -1 # Child not completed yet
...@@ -68,14 +68,14 @@ class Popen3: ...@@ -68,14 +68,14 @@ class Popen3:
_active.remove(self) _active.remove(self)
return self.sts return self.sts
def popen2(cmd): def popen2(cmd, bufsize=-1):
_cleanup() _cleanup()
inst = Popen3(cmd, 0) inst = Popen3(cmd, 0, bufsize)
return inst.fromchild, inst.tochild return inst.fromchild, inst.tochild
def popen3(cmd): def popen3(cmd, bufsize=-1):
_cleanup() _cleanup()
inst = Popen3(cmd, 1) inst = Popen3(cmd, 1, bufsize)
return inst.fromchild, inst.tochild, inst.childerr return inst.fromchild, inst.tochild, inst.childerr
def _test(): def _test():
......
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