From: Brian Curtin <brian.curtin@gmail.com>
Date: Mon, 6 Sep 2010 16:31:27 +0000 (+0000)
Subject: Merged revisions 84559 via svnmerge from
X-Git-Tag: v2.7.1rc1~337
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a0cb6a8d0616f6e8c00923a72a42170322e16f8;p=python

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.
........
---

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 68de777644..1691c05b1f 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