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

Modules might still be needed, even if psutil loads.

Browse source
This commit is contained in:
Michael Lustfield 2017-01-24 23:04:09 -06:00
parent fb0432fd21
commit 4966011cb5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/config/__init__.py
View file

@ -15,6 +15,7 @@ import codecs
import logging
from copy import deepcopy
import types
import platform
# Import third party libs
import yaml
@ -40,14 +41,13 @@ import salt.utils.xdg
import salt.exceptions
from salt.utils.locales import sdecode
import salt.defaults.exitcodes
import salt.grains.core
try:
import psutil
HAS_PSUTIL = True
except ImportError:
HAS_PSUTIL = False
import platform
import salt.grains.core
log = logging.getLogger(__name__)