valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update basestring -> string_types

Browse Source
This commit is contained in:
Erik Johnson 2014-03-20 18:51:51 -05:00
parent d312ff2b85
commit 4ea8d04386
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/grains/core.py
View File

@ -29,6 +29,7 @@ _supported_dists += ('arch', 'mageia', 'meego', 'vmware', 'bluewhite64',
import salt.log
import salt.utils
import salt.utils.network
from salt._compat import string_types
# Solve the Chicken and egg problem where grains need to run before any
# of the modules are loaded and are generally available for any usage.
@ -293,7 +294,7 @@ def _bsd_cpudata(osdata):
grains = dict([(k, __salt__['cmd.run'](v)) for k, v in cmds.items()])
if 'cpu_flags' in grains and isinstance(grains['cpu_flags'], basestring):
if 'cpu_flags' in grains and isinstance(grains['cpu_flags'], string_types):
grains['cpu_flags'] = grains['cpu_flags'].split(' ')
if osdata['kernel'] == 'NetBSD':