valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +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:52 -05:00
parent dacfae29aa
commit af5b2385f5
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/utils/pydsl.py
View File

@ -90,6 +90,7 @@ from uuid import uuid4 as _uuid
from salt.utils.odict import OrderedDict
from salt.utils import warn_until
from salt.state import HighState
from salt._compat import string_types
REQUISITES = set('require watch use require_in watch_in use_in'.split())
@ -255,7 +256,7 @@ class Sls(object):
modname, funcname = modname.rsplit('.', 1)
else:
funcname = (
x for x in args if isinstance(x, basestring)
x for x in args if isinstance(x, string_types)
).next()
args.remove(funcname)
mod = getattr(s, modname)