[py-svn] r11590 - in py/dist/py: . execnet

[hpk at codespeak.net]

Author: hpk
Date: Thu Apr 28 16:29:28 2005
New Revision: 11590

Modified:
   py/dist/py/__init__.py
   py/dist/py/execnet/register.py
Log:
try to nicely kill the depending process on unix platforms


Modified: py/dist/py/__init__.py
==============================================================================
--- py/dist/py/__init__.py	(original)
+++ py/dist/py/__init__.py	Thu Apr 28 16:29:28 2005
@@ -1,7 +1,7 @@
 """\
 the py lib is a development support library featuring
 py.test, an interactive testing tool which supports 
-unittesting with practically no boilerplate.
+unit-testing with practically no boilerplate.
 """  
 from initpkg import initpkg
 

Modified: py/dist/py/execnet/register.py
==============================================================================
--- py/dist/py/execnet/register.py	(original)
+++ py/dist/py/execnet/register.py	Thu Apr 28 16:29:28 2005
@@ -69,8 +69,13 @@
             self.trace("waiting for pid %s" % pid)
             try:
                 os.waitpid(pid, 0)
-            except OSError:
-                self.trace("child process %s already dead?" %pid)
+            except KeyboardInterrupt: 
+                if sys.platform != "win32": 
+                    os.kill(pid, 15) 
+                raise
+            except OSError, e:
+                self.trace("child process %s already dead? error:%s" %
+                           (str(e), pid))
 
 class PopenGateway(PopenCmdGateway):
     # use sysfind/sysexec/subprocess instead of os.popen?