summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-02-29 11:14:54 -0500
committerChris McDonough <chrism@plope.com>2012-02-29 11:14:54 -0500
commitf6bbf7f18dfb93cd83ee29fbd59158a518bde554 (patch)
tree10eafc5ea0a5c0a4a22899b930cc4854f02eaeb0
parentdfdc25447e3eb221eda40492082af89d7363a830 (diff)
downloadpyramid-f6bbf7f18dfb93cd83ee29fbd59158a518bde554.tar.gz
pyramid-f6bbf7f18dfb93cd83ee29fbd59158a518bde554.tar.bz2
pyramid-f6bbf7f18dfb93cd83ee29fbd59158a518bde554.zip
fix pserve tests under windows on python 2.6
-rw-r--r--pyramid/scripts/pserve.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index 8bd6c545c..31a07c46f 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -34,10 +34,11 @@ if WIN and not hasattr(os, 'kill'): # pragma: no cover
# py 2.6 on windows
def kill(pid, sig=None):
"""kill function for Win32"""
- # signal is ignored
+ # signal is ignored, semibogus raise message
kernel32 = ctypes.windll.kernel32
handle = kernel32.OpenProcess(1, 0, pid)
- return (0 != kernel32.TerminateProcess(handle, 0))
+ if (0 == kernel32.TerminateProcess(handle, 0)):
+ raise OSError('No such process %s' % pid)
else:
kill = os.kill