Merge lp:~psivaa/utah/remove-psutil-error-imports-utopic into lp:utah

[Para Siva]

psutil.error is being deprecated in utopic. This should therefore fix https://bugs.launchpad.net/utah/+bug/1325424. Which is the cause for utah server not being able to download client side logs recently in desktop and server smoke tests.

psutil.error is being deprecated in utopic. This should therefore fix https://bugs.launchpad.net/utah/+bug/1325424. Which is the cause for utah server not being able to download client side logs recently in desktop and server smoke tests.

Would require to have a closer look at the fix since the fix has not fully be verified. The utah-client and utah-common pkges are installed as deb files into the (utopic) clients.

[Paul Larson (pwlars)]

Let's make sure this really fixes the bug before closing it of course, but it works on precise and seems to be the right (only) thing for utopic+.
+1

review: Approve

[Andy Doan (doanac)]

psivaa - do you need me to merge this, or do you have permission?

[Para Siva (psivaa)]

doanac: I've now got the permission to merge it, but could get help building utah with this change. thanks

=== modified file 'utah/process.py'
--- utah/process.py	2014-04-23 15:48:19 +0000
+++ utah/process.py	2014-06-01 22:10:17 +0000
@@ -27,7 +27,6 @@
 import threading
 
 import psutil
-import psutil.error
 
 from utah import logger
 
@@ -46,7 +45,7 @@
     """
     try:
         proc = psutil.Process(pid)
-    except psutil.error.NoSuchProcess:
+    except psutil.NoSuchProcess:
         return None
 
     cmdline = ' '.join(proc.cmdline)
@@ -86,7 +85,7 @@
         for pid in pids:
             try:
                 cmdlines.append(' '.join(psutil.Process(pid).cmdline))
-            except psutil.error.NoSuchProcess:
+            except psutil.NoSuchProcess:
                 pass
         return any(pattern in cmdline for cmdline in cmdlines)