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 version checking in psutil_compat

Browse source
This commit is contained in:
Weilu Jia 2015-04-30 17:18:16 -07:00
parent 93ee411fd5
commit e48982ff9c
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/utils/psutil_compat.py
View file

@ -10,12 +10,10 @@ Built off of http://grodola.blogspot.com/2014/01/psutil-20-porting.html
from __future__ import absolute_import
#log = logging.getLogger(__name__)
# No exception handling, as we want ImportError if psutil doesn't exist
import psutil
if psutil.__version__ >= (2, 0):
if psutil.version_info >= (2, 0):
from psutil import *
else:
# Import hack to work around bugs in old psutil's