From 73d3075ce91c92b23ab372a4b580363fd440b562 Mon Sep 17 00:00:00 2001 From: rallytime Date: Thu, 21 Jul 2016 12:09:29 -0600 Subject: [PATCH] Remove string_types import from state compiler We have already import salt.ext.six above - no need to do it twice --- salt/state.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/salt/state.py b/salt/state.py index 19e671f129..4cf76ed57c 100644 --- a/salt/state.py +++ b/salt/state.py @@ -51,7 +51,6 @@ import salt.utils.yamlloader as yamlloader # pylint: disable=import-error,no-name-in-module,redefined-builtin import salt.ext.six as six from salt.ext.six.moves import map, range -from salt.ext.six import string_types # pylint: enable=import-error,no-name-in-module,redefined-builtin log = logging.getLogger(__name__) @@ -787,7 +786,7 @@ class State(object): else: low_data_onlyif = low_data['onlyif'] for entry in low_data_onlyif: - if not isinstance(entry, string_types): + if not isinstance(entry, six.string_types): ret.update({'comment': 'onlyif execution failed, bad type passed', 'result': False}) return ret cmd = self.functions['cmd.retcode']( @@ -808,7 +807,7 @@ class State(object): else: low_data_unless = low_data['unless'] for entry in low_data_unless: - if not isinstance(entry, string_types): + if not isinstance(entry, six.string_types): ret.update({'comment': 'unless execution failed, bad type passed', 'result': False}) return ret cmd = self.functions['cmd.retcode'](