Merge pull request splunk#206 from splunk/bug/DVPL-7312-exceptions-raised-for-unicode-characters

loganknecht · web-flow · commit 05f789c81fe4 · 2018-06-08T10:10:31.000-07:00
Fix XML responses to not throw errors for unicode characters in `splunklib/data.py` `load` function.
diff --git a/splunklib/data.py b/splunklib/data.py
@@ -17,6 +17,7 @@
 """
 
 from __future__ import absolute_import
+import sys
 from xml.etree.ElementTree import XML
 from splunklib import six
 
@@ -76,6 +77,11 @@ def load(text, match=None):
         'namespaces': [],
         'names': {}
     }
+
+    # Convert to unicode encoding in only python 2 for xml parser
+    if(sys.version_info < (3, 0, 0) and isinstance(text, unicode)):
+        text = text.encode('utf-8')
+
     root = XML(text)
     items = [root] if match is None else root.findall(match)
     count = len(items)
