Skip to content

Fix XML responses to not throw errors for unicode characters #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 8, 2018
Merged

Fix XML responses to not throw errors for unicode characters #206

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a0c84a
Fix XML responses to not throw errors for unicode characters
loganknecht Jun 6, 2018
8874404
Changed `splunklib/data.py` `load` function to convert string utf-8 e…
loganknecht Jun 6, 2018
9613e43
Fix XML responses to not throw errors for unicode characters
loganknecht Jun 7, 2018
e10e50d
Collapse conditional logic for function
loganknecht Jun 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions splunklib/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"""

from __future__ import absolute_import
import sys
from xml.etree.ElementTree import XML
from splunklib import six

Expand Down Expand Up @@ -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)
Expand Down