Merge lp:~markhor/light-locker-settings/fix_get_pid_list into lp:light-locker-settings

[Markhor]

Fix work with newer psutil

  Problem:
  https://bbs.archlinux.org/viewtopic.php?id=199003

  Cause:
  https://github.com/giampaolo/psutil/commit/fc8592a482c1232da33366a95ddd62a99130534a

  So psutil >= 2.0.0 breaks light-locker-settings.py

  Solution:
  Try both API variants

Fix work with newer psutil

  Problem:
  https://bbs.archlinux.org/viewtopic.php?id=199003

  Cause:
  https://github.com/giampaolo/psutil/commit/fc8592a482c1232da33366a95ddd62a99130534a

  So psutil >= 2.0.0 breaks light-locker-settings.py

  Solution:
  Try both API variants

[lp:~markhor/light-locker-settings/fix_get_pid_list]

151. By Markhor on 2016-03-19

Fix work with newer psutil

  Problem:
  https://bbs.archlinux.org/viewtopic.php?id=199003

  Cause:
  https://github.com/giampaolo/psutil/commit/fc8592a482c1232da33366a95ddd62a99130534a

  So psutil >= 2.0.0 breaks light-locker-settings.py

  Solution:
  Try both API variants

Unmerged revisions

151. By Markhor on 2016-03-19

Fix work with newer psutil

  Problem:
  https://bbs.archlinux.org/viewtopic.php?id=199003

  Cause:
  https://github.com/giampaolo/psutil/commit/fc8592a482c1232da33366a95ddd62a99130534a

  So psutil >= 2.0.0 breaks light-locker-settings.py

  Solution:
  Try both API variants

=== modified file 'light-locker-settings/light-locker-settings.py'
--- light-locker-settings/light-locker-settings.py	2015-06-09 17:06:49 +0000
+++ light-locker-settings/light-locker-settings.py	2016-03-19 08:26:11 +0000
@@ -218,7 +218,12 @@
     def check_running_process(self, process_name):
         """Return True if the specified process is active."""
         # Find the process...
-        for pid in psutil.get_pid_list():
+        try:
+            # since 2.0.0 - 2014-03-10
+            pids = psutil.pids()
+        except AttributeError:
+            pids = psutil.get_pid_list()
+        for pid in pids:
             try:
                 p = psutil.Process(pid)
                 if self.get_process_username(p) == username: