Cleanup FunctionWrapper

salt/client/ssh/wrapper/__init__.py

@@ -42,6 +42,18 @@ class FunctionWrapper(object):
         self.fsclient = fsclient
         self.kwargs.update(kwargs)
 
+    def __contains__(self, key):
+        '''
+        We need to implement a __contains__ method, othwerwise when someone
+        does a contains comparison python assumes this is a sequence, and does
+        __getitem__ keys 0 and up until IndexError
+        '''
+        try:
+            self[key]
+            return True
+        except KeyError:
+            return False
+
     def __getitem__(self, cmd):
         '''
         Return the function call to simulate the salt local lookup system

salt/renderers/yaml.py

@@ -64,12 +64,11 @@ def render(yaml_data, saltenv='base', sls='', argline='', **kws):
         if not data:
             data = {}
         else:
-            try:
+            if 'config.get' in __salt__:
                 if __salt__['config.get']('yaml_utf8', False):
                     data = _yaml_result_unicode_to_utf8(data)
-            except KeyError:
-                if __opts__.get('yaml_utf8'):
-                    data = _yaml_result_unicode_to_utf8(data)
+            elif __opts__.get('yaml_utf8'):
+                data = _yaml_result_unicode_to_utf8(data)
         log.debug('Results of YAML rendering: \n{0}'.format(data))
         return data