Remove conflicts from views after rebase

1 files changed, 3 insertions, 2 deletions

diff --git a/yaksh/base_evaluator.py b/yaksh/base_evaluator.py
index 071008f..e702f68 100644
--- a/yaksh/base_evaluator.py
+++ b/yaksh/base_evaluator.py
@@ -7,6 +7,7 @@ from os.path import join, isfile
 from os.path import isdir, dirname, abspath, join, isfile, exists
 import subprocess
 import stat
+import signal
 
 
 # Local imports
@@ -30,11 +31,11 @@ class BaseEvaluator(object):
         stdout and stderr.
         """
         try:
-            proc = subprocess.Popen(cmd_args, *args, **kw)
+            proc = subprocess.Popen(cmd_args,preexec_fn=os.setpgrp, *args, **kw)
             stdout, stderr = proc.communicate()
         except TimeoutException:
             # Runaway code, so kill it.
-            proc.kill()
+            os.killpg(os.getpgid(proc.pid), signal.SIGKILL)
             # Re-raise exception.
             raise
         return proc, stdout.decode('utf-8'), stderr.decode('utf-8')