commit bb5fe0742f3fd77dc3f1de1d3f063cdb99b186e6
author koder aka kdanilov <kdanilov@mirantis.com> Thu May 21 02:50:23 2015 +0300
committer koder aka kdanilov <kdanilov@mirantis.com> Thu May 21 02:50:23 2015 +0300
tree 48d77584db9d878005c4cd747d1265b17266a8f4
parent fd2cfa529d0746151604b47959206cbbdd23bf31

fix modules and 2.6 compatibility

wally/utils.py

diff --git a/wally/utils.py b/wally/utils.py
index d94d333..f5ab8b6 100644
--- a/wally/utils.py
+++ b/wally/utils.py
@@ -1,14 +1,17 @@
 import re
 import os
 import sys
-import time
-import psutil
 import socket
 import logging
 import threading
 import contextlib
 import subprocess
 
+try:
+    import psutil
+except ImportError:
+    psutil = None
+
 
 logger = logging.getLogger("wally")
 
@@ -191,11 +194,14 @@
     thread.join(timeout)
 
     if thread.is_alive():
+        if psutil is not None:
+            parent = psutil.Process(proc.pid)
+            for child in parent.children(recursive=True):
+                child.kill()
+            parent.kill()
+        else:
+            proc.kill()
 
-        parent = psutil.Process(proc.pid)
-        for child in parent.children(recursive=True):
-            child.kill()
-        parent.kill()
         thread.join()
         raise RuntimeError("Local process timeout: " + str(cmd))