Merge branch 'master' of github.com:giampaolo/psutil

.github/workflows/build.yml

@@ -132,7 +132,7 @@ jobs:
         python scripts/internal/print_hashes.py wheelhouse/
 
   freebsd:
-    runs-on: macos-10.15
+    runs-on: macos-12
     steps:
     - name: Cancel previous runs
       uses: styfle/cancel-workflow-action@0.6.0

CREDITS

@@ -798,3 +798,6 @@ N: Bernhard Urban-Forster
 C: Austria
 W: https://github.com/lewurm
 I: 2135
+
+N: Daniel Li
+I: 2150

HISTORY.rst

@@ -14,6 +14,8 @@ XXXX-XX-XX
   undefined ``ethtool_cmd_speed`` symbol.
 - 2142_, [POSIX]: `net_if_stats()`_ 's ``flags`` on Python 2 returned unicode
   instead of str.  (patch by Matthieu Darbois)
+- 2150_, [Linux] `Process.threads()`_ may raise ``NoSuchProcess``. Fix race
+  condition.  (patch by Daniel Li)
 
 5.9.2
 =====

psutil/_pslinux.py

@@ -2061,9 +2061,9 @@ def threads(self):
             try:
                 with open_binary(fname) as f:
                     st = f.read().strip()
-            except FileNotFoundError:
-                # no such file or directory; it means thread
-                # disappeared on us
+            except (FileNotFoundError, ProcessLookupError):
+                # no such file or directory or no such process;
+                # it means thread disappeared on us
                 hit_enoent = True
                 continue
             # ignore the first two values ("pid (exe)")
@@ -2217,7 +2217,7 @@ def open_files(self):
                         with open_binary(file) as f:
                             pos = int(f.readline().split()[1])
                             flags = int(f.readline().split()[1], 8)
-                    except FileNotFoundError:
+                    except (FileNotFoundError, ProcessLookupError):
                         # fd gone in the meantime; process may
                         # still be alive
                         hit_enoent = True