[Python-checkins] cpython (merge default -> default): Issue #10197: merge heads
tim.golden
python-checkins at python.org
Sun Nov 3 15:23:19 CET 2013
http://hg.python.org/cpython/rev/28a0ae3dcb16
changeset: 86882:28a0ae3dcb16
parent: 86878:2ed8d500e113
parent: 86880:05ce1bd1a4c2
user: Tim Golden <mail at timgolden.me.uk>
date: Sun Nov 03 14:21:29 2013 +0000
summary:
Issue #10197: merge heads
files:
Lib/subprocess.py | 24 +++++++++---------------
Lib/test/test_subprocess.py | 11 ++---------
Misc/NEWS | 3 +++
3 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -700,21 +700,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 --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -2158,13 +2158,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.
- at unittest.skipUnless(os.name == 'posix', "only relevant for UNIX")
class CommandTests(unittest.TestCase):
def test_getoutput(self):
self.assertEqual(subprocess.getoutput('echo xyzzy'), 'xyzzy')
@@ -2178,8 +2171,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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,6 +35,9 @@
TypeError instead of TclError on wrong number of arguments. Original patch
by Guilherme Polo.
+- Issue #10197: Rework subprocess.get[status]output to use subprocess
+ functionality and thus to work on Windows. Patch by Nick Coghlan
+
- Issue #6160: The bbox() method of tkinter.Spinbox now returns a tuple of
integers instead of a string. Based on patch by Guilherme Polo.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list