From af5b2385f5995c2f99ac78c447270c21d4ac0f6a Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Thu, 20 Mar 2014 18:51:52 -0500 Subject: [PATCH] update basestring -> string_types --- salt/utils/pydsl.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/utils/pydsl.py b/salt/utils/pydsl.py index 32b75b6e17..7af8874c30 100644 --- a/salt/utils/pydsl.py +++ b/salt/utils/pydsl.py @@ -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)