summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2020-05-23 03:04:37 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2020-05-23 03:04:37 +0200
commit5110af75ac1b2a1ae40144d13811bbcd4a6a3345 (patch)
treece0734830b52eebfcca3acbcf26527653069bc80
parentfec042bfe78fe3f617d87ad39bd0b273f8d4a1cb (diff)
downloadpsutil-5110af75ac1b2a1ae40144d13811bbcd4a6a3345.tar.gz
revert previous commit
-rw-r--r--psutil/_common.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/psutil/_common.py b/psutil/_common.py
index 017d8392..74366456 100644
--- a/psutil/_common.py
+++ b/psutil/_common.py
@@ -10,6 +10,7 @@
from __future__ import division, print_function
import contextlib
+import errno
import functools
import os
import socket
@@ -479,7 +480,9 @@ def isfile_strict(path):
"""
try:
st = os.stat(path)
- except FileNotFoundError:
+ except OSError as err:
+ if err.errno in (errno.EPERM, errno.EACCES):
+ raise
return False
else:
return stat.S_ISREG(st.st_mode)
@@ -492,7 +495,9 @@ def path_exists_strict(path):
"""
try:
os.stat(path)
- except FileNotFoundError:
+ except OSError as err:
+ if err.errno in (errno.EPERM, errno.EACCES):
+ raise
return False
else:
return True