Merge pull request #1 from EmersonElectricCo/flattenCell-fix

flattenCell Fix

Author: compsecmonkey

Scripts/script-CommonServerPython.yml

@@ -491,9 +491,16 @@ script: |-
       if isinstance(data, STRING_TYPES):
           return data
       elif isinstance(data, list):
-          return ',\n'.join(str(d) for d in data)
+          string_list = []
+          for d in data:
+              try:
+                  string_list.append(str(d))
+              except UnicodeEncodeError:
+                  string_list.append(d.encode('utf-8'))
+
+          return ',\n'.join(string_list)
       else:
-          return json.dumps(data, indent=indent)
+          return json.dumps(data, indent=indent, ensure_ascii=False)
 
 
   def FormatIso8601(t):