# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1312792720 -3600
# Node ID 600f20908ede75db66fec2d08875f285abd746c4
# Parent  9c15f5c37707b54c6782db53e078a4582d4bc011# Parent  a50ed14997fc1e9d2d285e8f74b125ac65fcd741
Merge with stable

diff -r 9c15f5c37707 -r 600f20908ede tests/run-tests.py
--- a/tests/run-tests.py	Thu Jul 14 08:39:48 2011 +0100
+++ b/tests/run-tests.py	Mon Aug 08 09:38:40 2011 +0100
@@ -340,10 +340,7 @@
     """Terminate subprocess (with fallback for Python versions < 2.6)"""
     vlog('# Terminating process %d' % proc.pid)
     try:
-        if hasattr(proc, 'terminate'):
-            proc.terminate()
-        else:
-            os.kill(proc.pid, signal.SIGTERM)
+        getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))()
     except OSError:
         pass