Skip to content

Commit cd268aa

Browse files
committed
Release 1.6.9
2 parents 07278fa + e168d65 commit cd268aa

File tree

6 files changed

+10
-13
lines changed

6 files changed

+10
-13
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Splunk SDK for Python Changelog
22

3+
## Version 1.6.9
4+
5+
### Bug Fix
6+
7+
* Fix buffered input in python 3
8+
39
## Version 1.6.8
410

511
### Bug Fix

examples/searchcommands_app/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ def run(self):
439439
setup(
440440
description='Custom Search Command examples',
441441
name=os.path.basename(project_dir),
442-
version='1.6.8',
442+
version='1.6.9',
443443
author='Splunk, Inc.',
444444
author_email='[email protected]',
445445
url='http://github.com/splunk/splunk-sdk-python',

splunklib/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717
from __future__ import absolute_import
1818
from splunklib.six.moves import map
19-
__version_info__ = (1, 6, 8)
19+
__version_info__ = (1, 6, 9)
2020
__version__ = ".".join(map(str, __version_info__))

splunklib/binding.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ def request(url, message, **kwargs):
13691369
head = {
13701370
"Content-Length": str(len(body)),
13711371
"Host": host,
1372-
"User-Agent": "splunk-sdk-python/1.6.6",
1372+
"User-Agent": "splunk-sdk-python/1.6.9",
13731373
"Accept": "*/*",
13741374
"Connection": "Close",
13751375
} # defaults

splunklib/searchcommands/internals.py

-4
Original file line numberDiff line numberDiff line change
@@ -364,10 +364,6 @@ def read(self, ifile):
364364
name, value = None, None
365365

366366
for line in ifile:
367-
# SPL-175233 -- input is buffered, needs to be decoded
368-
if sys.version_info >= (3, 0):
369-
line = line.decode()
370-
371367
if line == '\n':
372368
break
373369
item = line.split(':', 1)

splunklib/searchcommands/search_command.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -1054,13 +1054,8 @@ def iteritems(self):
10541054
SearchMetric = namedtuple('SearchMetric', ('elapsed_seconds', 'invocation_count', 'input_count', 'output_count'))
10551055

10561056

1057-
# SPL-175233, set default stdin to be buffered
1058-
if sys.version_info >= (3, 0) and sys.platform == 'win32':
1059-
stdinput = sys.stdin.buffer
1060-
else:
1061-
stdinput = sys.stdin
10621057

1063-
def dispatch(command_class, argv=sys.argv, input_file=stdinput, output_file=sys.stdout, module_name=None):
1058+
def dispatch(command_class, argv=sys.argv, input_file=sys.stdin, output_file=sys.stdout, module_name=None):
10641059
""" Instantiates and executes a search command class
10651060
10661061
This function implements a `conditional script stanza <https://docs.python.org/2/library/__main__.html>`_ based on the value of

0 commit comments

Comments
 (0)