From b066cef7d33bcff49b154a2d0540dc5d2719876f Mon Sep 17 00:00:00 2001 From: vmalaviya Date: Thu, 2 Dec 2021 16:17:56 +0530 Subject: [PATCH 1/2] Python3 compatibility for ResponseReader.__str__() --- splunklib/binding.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/splunklib/binding.py b/splunklib/binding.py index 94cc5581..73e4cad6 100644 --- a/splunklib/binding.py +++ b/splunklib/binding.py @@ -1290,7 +1290,11 @@ def __init__(self, response, connection=None): self._buffer = b'' def __str__(self): - return self.read() + import sys + if sys.version_info[0] < 3: + return self.read() + else: + return str(self.read(), 'UTF-8') @property def empty(self): From 4e3cab2dea0ab57d305b982c588df1cd70b295ff Mon Sep 17 00:00:00 2001 From: vmalaviya Date: Tue, 11 Jan 2022 13:40:59 +0530 Subject: [PATCH 2/2] version checking updated for __str__ method --- splunklib/binding.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/splunklib/binding.py b/splunklib/binding.py index 73e4cad6..d6489950 100644 --- a/splunklib/binding.py +++ b/splunklib/binding.py @@ -1290,8 +1290,7 @@ def __init__(self, response, connection=None): self._buffer = b'' def __str__(self): - import sys - if sys.version_info[0] < 3: + if six.PY2: return self.read() else: return str(self.read(), 'UTF-8')