summaryrefslogtreecommitdiff
path: root/psutil/_psosx.py
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-10-25 18:02:46 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2016-10-25 18:02:46 +0200
commit4b134aa8e203e5e7c8f8cfb8edc2751cf888516f (patch)
tree87a75ac20a2ef808e2a2a834414da5f9d2c2777d /psutil/_psosx.py
parentf2e9e7a4d0e09953b3bbed10f9b5674761df9b90 (diff)
parent55dcd0204feed052276d310f23c633c20a392acf (diff)
downloadpsutil-4b134aa8e203e5e7c8f8cfb8edc2751cf888516f.tar.gz
merge from master
Diffstat (limited to 'psutil/_psosx.py')
-rw-r--r--psutil/_psosx.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/psutil/_psosx.py b/psutil/_psosx.py
index 361c0a8b..2665080e 100644
--- a/psutil/_psosx.py
+++ b/psutil/_psosx.py
@@ -220,7 +220,9 @@ def net_if_stats():
names = net_io_counters().keys()
ret = {}
for name in names:
- isup, duplex, speed, mtu = cext_posix.net_if_stats(name)
+ mtu = cext_posix.net_if_mtu(name)
+ isup = cext_posix.net_if_flags(name)
+ duplex, speed = cext_posix.net_if_duplex_speed(name)
if hasattr(_common, 'NicDuplex'):
duplex = _common.NicDuplex(duplex)
ret[name] = _common.snicstats(isup, duplex, speed, mtu)
@@ -269,6 +271,11 @@ def wrap_exceptions(fun):
try:
return fun(self, *args, **kwargs)
except OSError as err:
+ if self.pid == 0:
+ if 0 in pids():
+ raise AccessDenied(self.pid, self._name)
+ else:
+ raise
if err.errno == errno.ESRCH:
if not pid_exists(self.pid):
raise NoSuchProcess(self.pid, self._name)