updated errors check for encode/decode

splunk · Jul 11, 2023 · d2a4af2 · d2a4af2
1 parent 9ef371f
commit d2a4af2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/splunklib/modularinput/event_writer.py b/splunklib/modularinput/event_writer.py
@@ -77,7 +77,7 @@ def write_xml_document(self, document):
 
         :param document: An ``ElementTree`` object.
         """
-        self._out.write(ensure_str(ET.tostring(document)))
+        self._out.write(ensure_str(ET.tostring(document), errors="replace"))
         self._out.flush()
 
     def close(self):

diff --git a/splunklib/searchcommands/search_command.py b/splunklib/searchcommands/search_command.py
@@ -934,7 +934,7 @@ def _read_chunk(istream):
         except Exception as error:
             raise RuntimeError('Failed to read body of length {}: {}'.format(body_length, error))
 
-        return metadata, six.ensure_str(body)
+        return metadata, six.ensure_str(body, errors="replace")
 
     _header = re.compile(r'chunked\s+1.0\s*,\s*(\d+)\s*,\s*(\d+)\s*\n')
 

diff --git a/splunklib/six.py b/splunklib/six.py
@@ -898,7 +898,7 @@ def ensure_binary(s, encoding='utf-8', errors='strict'):
         raise TypeError("not expecting type '%s'" % type(s))
 
 
-def ensure_str(s, encoding='utf-8', errors='replace'):
+def ensure_str(s, encoding='utf-8', errors='strict'):
     """Coerce *s* to `str`.
 
     For Python 2: