[Python-checkins] r84560 - in python/branches/release27-maint: Lib/subprocess.py

[brian.curtin]

Author: brian.curtin
Date: Mon Sep  6 18:31:27 2010
New Revision: 84560

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/subprocess.py

Modified: python/branches/release27-maint/Lib/subprocess.py
==============================================================================
--- python/branches/release27-maint/Lib/subprocess.py	(original)
+++ python/branches/release27-maint/Lib/subprocess.py	Mon Sep  6 18:31:27 2010
@@ -993,7 +993,7 @@
             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