saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix imports that aren't in __all__

Browse source
This commit is contained in:
Weilu Jia 2015-05-15 14:23:23 -07:00
parent 8a1da33ada
commit 5dd6d69192
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/utils/psutil_compat.py
View file

@ -28,6 +28,10 @@ else:
except AttributeError:
pass
# Import functions not in __all__
from psutil import disk_partitions
from psutil import disk_usage
# Alias new module functions
def boot_time():
return psutil.BOOT_TIME
@ -39,7 +43,7 @@ else:
pids = psutil.get_pid_list
users = psutil.get_users
#Deprecated in 1.0.1, but not mentioned in blog post
# Deprecated in 1.0.1, but not mentioned in blog post
if psutil.version_info < (1, 0, 1):
net_io_counters = psutil.network_io_counters()