mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 09:15:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Now uses pipes.

Browse source
This commit is contained in:
Guido van Rossum 1991-08-16 13:23:29 +00:00
parent 0d3f4678ba
commit 48154be152
1 changed files with 9 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Lib/commands.py
View file

@ -2,11 +2,6 @@
# #
# Various tools for executing commands and looking at their output and status. # Various tools for executing commands and looking at their output and status.
import rand
import posix
import stat
import path
# Get 'ls -l' status for an object into a string # Get 'ls -l' status for an object into a string
# #
@ -16,8 +11,7 @@ def getstatus(file):
# Get the output from a shell command into a string. # Get the output from a shell command into a string.
# The exit status is ignored; a trailing newline is stripped. # The exit status is ignored; a trailing newline is stripped.
# Assume the command will work with ' >tempfile 2>&1' appended. # Assume the command will work with '{ ... ; } 2>&1' around it..
# XXX This should use posix.popen() instead, should it exist.
# #
def getoutput(cmd): def getoutput(cmd):
return getstatusoutput(cmd)[1] return getstatusoutput(cmd)[1]
@ -27,42 +21,25 @@ def getoutput(cmd):
# Returns a pair (sts, output) # Returns a pair (sts, output)
# #
def getstatusoutput(cmd): def getstatusoutput(cmd):
tmp = '/usr/tmp/wdiff' + `rand.rand()` import posix
sts = -1 pipe = posix.popen('{ ' + cmd + '; } 2>&1', 'r')
try: text = pipe.read()
sts = posix.system(cmd + ' >' + tmp + ' 2>&1') sts = pipe.close()
text = readfile(tmp) if sts = None: sts = 0
finally:
altsts = posix.system('rm -f ' + tmp)
if text[-1:] = '\n': text = text[:-1] if text[-1:] = '\n': text = text[:-1]
return sts, text return sts, text
# Return a string containing a file's contents.
#
def readfile(fn):
st = posix.stat(fn)
size = st[stat.ST_SIZE]
if not size: return ''
try:
fp = open(fn, 'r')
except:
raise posix.error, 'readfile(' + fn + '): open failed'
try:
return fp.read(size)
except:
raise posix.error, 'readfile(' + fn + '): read failed'
# Make command argument from directory and pathname (prefix space, add quotes). # Make command argument from directory and pathname (prefix space, add quotes).
# #
def mk2arg(head, x): def mk2arg(head, x):
return mkarg(path.cat(head, x)) import path
return mkarg(path.join(head, x))
# Make a shell command argument from a string. # Make a shell command argument from a string.
# Two strategies: enclose in single quotes if it contains none; # Two strategies: enclose in single quotes if it contains none;
# otherwis, enclose in double quotes and prefix quotable characters # otherwise, enclose in double quotes and prefix quotable characters
# with backslash. # with backslash.
# #
def mkarg(x): def mkarg(x):