For python3 support, change default stdin to be buffered,

wimcolgate · wimcolgate · commit b135f90562bd · 2019-08-29T15:45:46.000-07:00
and adjust end-of-line terminator to be \n instead of \r\n
diff --git a/splunklib/searchcommands/internals.py b/splunklib/searchcommands/internals.py
@@ -39,7 +39,8 @@
 
 csv.field_size_limit(10485760)  # The default value is 128KB; upping to 10MB. See SPL-12117 for background on this issue
 
-if sys.platform == 'win32':
+# SPL-175233 -- python3 stdout is already binary
+if sys.platform == 'win32' and sys.version_info <= (3, 0):
     # Work around the fact that on Windows '\n' is mapped to '\r\n'. The typical solution is to simply open files in
     # binary mode, but stdout is already open, thus this hack. 'CPython' and 'PyPy' work differently. We assume that
     # all other Python implementations are compatible with 'CPython'. This might or might not be a valid assumption.
@@ -339,6 +340,8 @@ class CsvDialect(csv.Dialect):
     doublequote = True
     skipinitialspace = False
     lineterminator = '\r\n'
+    if sys.version_info >= (3, 0) and sys.platform == 'win32':
+        lineterminator = '\n'
     quoting = csv.QUOTE_MINIMAL
 
 
@@ -361,6 +364,10 @@ def read(self, ifile):
         name, value = None, None
 
         for line in ifile:
+            # SPL-175233 -- input is buffered, needs to be decoded
+            if sys.version_info >= (3, 0):
+                line = line.decode()
+
             if line == '\n':
                 break
             item = line.split(':', 1)
@@ -658,6 +665,13 @@ class RecordWriterV1(RecordWriter):
 
     def flush(self, finished=None, partial=None):
 
+        # SPL-175233
+        def writeEOL():
+            if sys.version_info >= (3, 0) and sys.platform == 'win32':
+                write('\n')
+            else:
+                write('\r\n')
+
         RecordWriter.flush(self, finished, partial)  # validates arguments and the state of this instance
 
         if self._record_count > 0 or (self._chunk_count == 0 and 'messages' in self._inspector):
@@ -678,9 +692,9 @@ def flush(self, finished=None, partial=None):
                         write(message_level(level, level))
                         write('=')
                         write(text)
-                        write('\r\n')
+                        writeEOL()
 
-                write('\r\n')
+                writeEOL()
 
             elif messages is not None:
 
diff --git a/splunklib/searchcommands/search_command.py b/splunklib/searchcommands/search_command.py
@@ -1054,7 +1054,13 @@ def iteritems(self):
 SearchMetric = namedtuple('SearchMetric', ('elapsed_seconds', 'invocation_count', 'input_count', 'output_count'))
 
 
-def dispatch(command_class, argv=sys.argv, input_file=sys.stdin, output_file=sys.stdout, module_name=None):
+# SPL-175233, set default stdin to be buffered
+if sys.version_info >= (3, 0) and sys.platform == 'win32':
+    stdinput = sys.stdin.buffer
+else:
+    stdinput = sys.stdin
+
+def dispatch(command_class, argv=sys.argv, input_file=stdinput, output_file=sys.stdout, module_name=None):
     """ Instantiates and executes a search command class
 
     This function implements a `conditional script stanza <https://docs.python.org/2/library/__main__.html>`_ based on the value of
