Issue #10197 Rework subprocess.get[status]output to use subprocess functionality and thus to work on Windows. Patch by Nick Coghlan.
This commit is contained in:
parent
0bdcdecca7
commit
e004175c56
|
@ -681,21 +681,15 @@ def getstatusoutput(cmd):
|
|||
>>> subprocess.getstatusoutput('/bin/junk')
|
||||
(256, 'sh: /bin/junk: not found')
|
||||
"""
|
||||
with os.popen('{ ' + cmd + '; } 2>&1', 'r') as pipe:
|
||||
try:
|
||||
text = pipe.read()
|
||||
sts = pipe.close()
|
||||
except:
|
||||
process = pipe._proc
|
||||
process.kill()
|
||||
process.wait()
|
||||
raise
|
||||
if sts is None:
|
||||
sts = 0
|
||||
if text[-1:] == '\n':
|
||||
text = text[:-1]
|
||||
return sts, text
|
||||
|
||||
try:
|
||||
data = check_output(cmd, shell=True, universal_newlines=True, stderr=STDOUT)
|
||||
status = 0
|
||||
except CalledProcessError as ex:
|
||||
data = ex.output
|
||||
status = ex.returncode
|
||||
if data[-1:] == '\n':
|
||||
data = data[:-1]
|
||||
return status, data
|
||||
|
||||
def getoutput(cmd):
|
||||
"""Return output (stdout or stderr) of executing cmd in a shell.
|
||||
|
|
|
@ -2133,13 +2133,6 @@ class Win32ProcessTestCase(BaseTestCase):
|
|||
def test_terminate_dead(self):
|
||||
self._kill_dead_process('terminate')
|
||||
|
||||
|
||||
# The module says:
|
||||
# "NB This only works (and is only relevant) for UNIX."
|
||||
#
|
||||
# Actually, getoutput should work on any platform with an os.popen, but
|
||||
# I'll take the comment as given, and skip this suite.
|
||||
@unittest.skipUnless(os.name == 'posix', "only relevant for UNIX")
|
||||
class CommandTests(unittest.TestCase):
|
||||
def test_getoutput(self):
|
||||
self.assertEqual(subprocess.getoutput('echo xyzzy'), 'xyzzy')
|
||||
|
@ -2153,8 +2146,8 @@ class CommandTests(unittest.TestCase):
|
|||
try:
|
||||
dir = tempfile.mkdtemp()
|
||||
name = os.path.join(dir, "foo")
|
||||
|
||||
status, output = subprocess.getstatusoutput('cat ' + name)
|
||||
status, output = subprocess.getstatusoutput(
|
||||
("type " if mswindows else "cat ") + name)
|
||||
self.assertNotEqual(status, 0)
|
||||
finally:
|
||||
if dir is not None:
|
||||
|
|
|
@ -13,6 +13,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #10197: Rework subprocess.get[status]output to use subprocess
|
||||
functionality and thus to work on Windows. Patch by Nick Coghlan.
|
||||
|
||||
- Issue #19286: Directories in ``package_data`` are no longer added to
|
||||
the filelist, preventing failure outlined in the ticket.
|
||||
|
||||
|
|
Loading…
Reference in New Issue