summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2010-09-06 16:31:27 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2010-09-06 16:31:27 (GMT)
commit9a0cb6a8d0616f6e8c00923a72a42170322e16f8 (patch)
tree1331472a6eabe23c870d8c63403b33c9e286dfe5
parent8426333a88f0959a55b351813f5987238ffd0e17 (diff)
downloadcpython-9a0cb6a8d0616f6e8c00923a72a42170322e16f8.zip
cpython-9a0cb6a8d0616f6e8c00923a72a42170322e16f8.tar.gz
cpython-9a0cb6a8d0616f6e8c00923a72a42170322e16f8.tar.bz2
Merged revisions 84559 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84559 | brian.curtin | 2010-09-06 11:29:29 -0500 (Mon, 06 Sep 2010) | 6 lines Fix #8956. ValueError message was only mentioning one signal. Rather than list out the three signals (or more over time), the message was made less specific but still descriptive. ........
-rw-r--r--Lib/subprocess.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 68de777..1691c05 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -993,7 +993,7 @@ class Popen(object):
elif sig == signal.CTRL_BREAK_EVENT:
os.kill(self.pid, signal.CTRL_BREAK_EVENT)
else:
- raise ValueError("Only SIGTERM is supported on Windows")
+ raise ValueError("Unsupported signal")
def terminate(self):
"""Terminates the process