diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-06-04 04:07:01 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-06-04 04:07:01 +0200 |
| commit | 5ab1630d41245c92e0dc65bd70cd7cd438b0efbc (patch) | |
| tree | 63a0d0641069cc770b9ade8c193a6fc102a330e7 /psutil/_psosx.py | |
| parent | 0ea57b76f1a003ac962e4899a974bac1e844b9fb (diff) | |
| download | psutil-5ab1630d41245c92e0dc65bd70cd7cd438b0efbc.tar.gz | |
move stuff around
Diffstat (limited to 'psutil/_psosx.py')
| -rw-r--r-- | psutil/_psosx.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/psutil/_psosx.py b/psutil/_psosx.py index 9e5d7636..98b2ac5e 100644 --- a/psutil/_psosx.py +++ b/psutil/_psosx.py @@ -144,6 +144,10 @@ def cpu_stats(): # ===================================================================== +disk_usage = _psposix.disk_usage +disk_io_counters = cext.disk_io_counters + + def disk_partitions(all=False): retlist = [] partitions = cext.disk_partitions() @@ -159,15 +163,15 @@ def disk_partitions(all=False): return retlist -disk_usage = _psposix.disk_usage -disk_io_counters = cext.disk_io_counters - - # ===================================================================== # --- network # ===================================================================== +net_io_counters = cext.net_io_counters +net_if_addrs = cext_posix.net_if_addrs + + def net_connections(kind='inet'): # Note: on OSX this will fail with AccessDenied unless # the process is owned by root. @@ -197,10 +201,6 @@ def net_if_stats(): return ret -net_io_counters = cext.net_io_counters -net_if_addrs = cext_posix.net_if_addrs - - # ===================================================================== # --- other system functions # ===================================================================== |