Merge lp:~nuclearbob/utah/psutil-2 into lp:utah

[Max Brustkern]

This branch checks for psutil > 2 and uses cmdline() instead of cmdline if that is installed. I've only been able to test it on utopic so far, so maybe someone can help me test it on older versions.

[Para Siva (psivaa)]

+1. Worked on a trusty with (1,2,1) psutil

review: Approve

[Max Brustkern (nuclearbob)]

Should I go ahead and merge this, or should somebody from CI do it?

=== modified file 'utah/process.py'
--- utah/process.py	2014-06-01 22:01:15 +0000
+++ utah/process.py	2014-07-10 15:00:32 +0000
@@ -84,7 +84,10 @@
         cmdlines = []
         for pid in pids:
             try:
-                cmdlines.append(' '.join(psutil.Process(pid).cmdline))
+                if psutil.version_info > (2, 0, 0):
+                    cmdlines.append(' '.join(psutil.Process(pid).cmdline()))
+                else:
+                    cmdlines.append(' '.join(psutil.Process(pid).cmdline))
             except psutil.NoSuchProcess:
                 pass
         return any(pattern in cmdline for cmdline in cmdlines)