Use pytest, get rid of test/runner.py

psutil/_psaix.py

@@ -349,7 +349,7 @@ def wrapper(self, *args, **kwargs):
 class Process:
     """Wrapper class around underlying C implementation."""
 
-    __slots__ = ["pid", "_name", "_ppid", "_procfs_path", "_cache"]
+    __slots__ = ["_cache", "_name", "_ppid", "_procfs_path", "pid"]
 
     def __init__(self, pid):
         self.pid = pid

psutil/_psbsd.py

@@ -640,7 +640,7 @@ def wrap_exceptions_procfs(inst):
 class Process:
     """Wrapper class around underlying C implementation."""
 
-    __slots__ = ["pid", "_name", "_ppid", "_cache"]
+    __slots__ = ["_cache", "_name", "_ppid", "pid"]
 
     def __init__(self, pid):
         self.pid = pid

psutil/_pslinux.py

@@ -1732,7 +1732,7 @@ def wrapper(self, *args, **kwargs):
 class Process:
     """Linux process implementation."""
 
-    __slots__ = ["pid", "_name", "_ppid", "_procfs_path", "_cache"]
+    __slots__ = ["_cache", "_name", "_ppid", "_procfs_path", "pid"]
 
     def __init__(self, pid):
         self.pid = pid

psutil/_psosx.py

@@ -361,7 +361,7 @@ def wrapper(self, *args, **kwargs):
 class Process:
     """Wrapper class around underlying C implementation."""
 
-    __slots__ = ["pid", "_name", "_ppid", "_cache"]
+    __slots__ = ["_cache", "_name", "_ppid", "pid"]
 
     def __init__(self, pid):
         self.pid = pid

psutil/_pssunos.py

@@ -387,7 +387,7 @@ def wrapper(self, *args, **kwargs):
 class Process:
     """Wrapper class around underlying C implementation."""
 
-    __slots__ = ["pid", "_name", "_ppid", "_procfs_path", "_cache"]
+    __slots__ = ["_cache", "_name", "_ppid", "_procfs_path", "pid"]
 
     def __init__(self, pid):
         self.pid = pid

psutil/_pswindows.py

@@ -762,7 +762,7 @@ def wrapper(self, *args, **kwargs):
 class Process:
     """Wrapper class around underlying C implementation."""
 
-    __slots__ = ["pid", "_name", "_ppid", "_cache"]
+    __slots__ = ["_cache", "_name", "_ppid", "pid"]
 
     def __init__(self, pid):
         self.pid = pid

psutil/tests/test_posix.py

@@ -315,7 +315,7 @@ def test_pids(self):
         pids_psutil = psutil.pids()
 
         # on MACOS and OPENBSD ps doesn't show pid 0
-        if MACOS or OPENBSD and 0 not in pids_ps:
+        if MACOS or (OPENBSD and 0 not in pids_ps):
             pids_ps.insert(0, 0)
 
         # There will often be one more process in pids_ps for ps itself

psutil/tests/test_process.py

@@ -623,7 +623,7 @@ def test_memory_full_info(self):
         for name in mem._fields:
             value = getattr(mem, name)
             self.assertGreaterEqual(value, 0, msg=(name, value))
-            if name == 'vms' and OSX or LINUX:
+            if (name == 'vms' and OSX) or LINUX:
                 continue
             self.assertLessEqual(value, total, msg=(name, value, total))
         if LINUX or WINDOWS or MACOS:

psutil/tests/test_process_all.py

@@ -319,7 +319,7 @@ def memory_full_info(self, ret, info):
             value = getattr(ret, name)
             self.assertIsInstance(value, (int, long))
             self.assertGreaterEqual(value, 0, msg=(name, value))
-            if LINUX or OSX and name in ('vms', 'data'):
+            if LINUX or (OSX and name in ('vms', 'data')):
                 # On Linux there are processes (e.g. 'goa-daemon') whose
                 # VMS is incredibly high for some reason.
                 continue

pyproject.toml

@@ -23,7 +23,12 @@ select = [
     "D301",  # Use `r"""` if any backslashes in a docstring
     "D403",  # [*] First word of the first line should be capitalized
     "PERF102",  # [*] When using only the keys of a dict use the `keys()` method
+    "PLR5501",  # [*] Use `elif` instead of `else` then `if`, to reduce indentation
+    "PLR6104",  # Use `+=` to perform an augmented assignment directly
+    "PLW0602",  # Using global for `x` but no assignment is done
     "RET507",  # Unnecessary `elif` after `continue` statement
+    "RUF021",  # [*] Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear
+    "RUF023",  # [*] `Class.__slots__` is not sorted
     "S113",  # Probable use of requests call without timeout
     "S602",  # `subprocess` call with `shell=True` identified, security issue
 ]

scripts/pidof.py

@@ -22,10 +22,8 @@ def pidof(pgname):
     pids = []
     for proc in psutil.process_iter(['name', 'cmdline']):
         # search for matches in the process name and cmdline
-        if (
-            proc.info['name'] == pgname
-            or proc.info['cmdline']
-            and proc.info['cmdline'][0] == pgname
+        if proc.info['name'] == pgname or (
+            proc.info['cmdline'] and proc.info['cmdline'][0] == pgname
         ):
             pids.append(str(proc.pid))
     return pids