(original) (raw)

changeset: 86881:b6efaa97ee0e branch: 3.3 parent: 86876:3f5e35b766ac parent: 86879:c34e163c0086 user: Tim Golden mail@timgolden.me.uk date: Sun Nov 03 14:20:23 2013 +0000 files: Misc/NEWS description: Issue #10197: merge heads diff -r 3f5e35b766ac -r b6efaa97ee0e Lib/subprocess.py --- a/Lib/subprocess.py Sun Nov 03 14:29:35 2013 +0200 +++ b/Lib/subprocess.py Sun Nov 03 14:20:23 2013 +0000 @@ -681,21 +681,15 @@ >>> 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. diff -r 3f5e35b766ac -r b6efaa97ee0e Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py Sun Nov 03 14:29:35 2013 +0200 +++ b/Lib/test/test_subprocess.py Sun Nov 03 14:20:23 2013 +0000 @@ -2133,13 +2133,6 @@ 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 @@ 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: diff -r 3f5e35b766ac -r b6efaa97ee0e Misc/NEWS --- a/Misc/NEWS Sun Nov 03 14:29:35 2013 +0200 +++ b/Misc/NEWS Sun Nov 03 14:20:23 2013 +0000 @@ -16,6 +16,9 @@ - Issue #6157: Fixed tkinter.Text.debug(). Original patch by Guilherme Polo. - Issue #6160: The bbox() method of tkinter.Spinbox now returns a tuple of + +- Issue #10197: Rework subprocess.get[status]output to use subprocess + functionality and thus to work on Windows. Patch by Nick Coghlan. integers instead of a string. Based on patch by Guilherme Polo. - Issue #19286: Directories in ``package_data`` are no longer added to /mail@timgolden.me.uk