handle not string objects

saltstack · Mar 30, 2019 · 87b6843 · 87b6843
1 parent 5354f24
commit 87b6843
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/salt/state.py b/salt/state.py
@@ -2134,19 +2134,26 @@ def format_slots(self, cdata):
                 if isinstance(arg, dict):
                     # Search dictionary values for __slot__:
                     for key, value in arg.items():
-                        if isinstance(value, six.text_type):
+                        try:
                             if value.startswith(SLOT_TEXT):
                                 log.debug("Slot processsing dict value %s", value)
                                 cdata[atype][ind][key] = self.__eval_slot(value)
+                        except AttributeError:
+                            # Not a string/slot
+                            continue
                 elif isinstance(arg, list):
                     for idx, listvalue in enumerate(arg):
                         log.debug("Slot processing list value: %s", listvalue)
                         if isinstance(listvalue, dict):
                             # Search dict values in list for __slot__:
                             for key, value in listvalue.items():
-                                if value.startswith(SLOT_TEXT):
-                                    log.debug("Slot processsing nested dict value %s", value)
-                                    cdata[atype][ind][idx][key] = self.__eval_slot(value)
+                                try:
+                                    if value.startswith(SLOT_TEXT):
+                                        log.debug("Slot processsing nested dict value %s", value)
+                                        cdata[atype][ind][idx][key] = self.__eval_slot(value)
+                                except AttributeError:
+                                    # Not a string/slot
+                                    continue
                         if isinstance(listvalue, six.text_type):
                             # Search strings in a list for __slot__:
                             if listvalue.startswith(SLOT_TEXT):