Release 1.6.9

splunk · Sep 21, 2019 · cd268aa · cd268aa
2 parents 07278fa + e168d65
commit cd268aa
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Splunk SDK for Python Changelog
 
+## Version 1.6.9
+
+### Bug Fix
+
+* Fix buffered input in python 3 
+
 ## Version 1.6.8
 
 ### Bug Fix

diff --git a/examples/searchcommands_app/setup.py b/examples/searchcommands_app/setup.py
@@ -439,7 +439,7 @@ def run(self):
     setup(
         description='Custom Search Command examples',
         name=os.path.basename(project_dir),
-        version='1.6.8',
+        version='1.6.9',
         author='Splunk, Inc.',
         author_email='devinfo@splunk.com',
         url='http://github.com/splunk/splunk-sdk-python',

diff --git a/splunklib/__init__.py b/splunklib/__init__.py
@@ -16,5 +16,5 @@
 
 from __future__ import absolute_import
 from splunklib.six.moves import map
-__version_info__ = (1, 6, 8)
+__version_info__ = (1, 6, 9)
 __version__ = ".".join(map(str, __version_info__))
diff --git a/splunklib/binding.py b/splunklib/binding.py
@@ -1369,7 +1369,7 @@ def request(url, message, **kwargs):
         head = {
             "Content-Length": str(len(body)),
             "Host": host,
-            "User-Agent": "splunk-sdk-python/1.6.6",
+            "User-Agent": "splunk-sdk-python/1.6.9",
             "Accept": "*/*",
             "Connection": "Close",
         } # defaults

diff --git a/splunklib/searchcommands/internals.py b/splunklib/searchcommands/internals.py
@@ -364,10 +364,6 @@ 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)

diff --git a/splunklib/searchcommands/search_command.py b/splunklib/searchcommands/search_command.py
@@ -1054,13 +1054,8 @@ def iteritems(self):
 SearchMetric = namedtuple('SearchMetric', ('elapsed_seconds', 'invocation_count', 'input_count', 'output_count'))
 
 
-# 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):
+def dispatch(command_class, argv=sys.argv, input_file=sys.stdin, 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