summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-01-18 12:06:49 -0500
committerKenny Woodson <kwoodson@redhat.com>2017-01-18 12:06:49 -0500
commit3fd3cd3a07d9f000c8cb8bd1b7a49ac2af675696 (patch)
tree87aef5928ed8393090c78b64ba83730a10f7ff34 /roles/lib_openshift
parent24a504f03a3d5edfe8957dcfaa4bde98ae0e60ec (diff)
downloadopenshift-3fd3cd3a07d9f000c8cb8bd1b7a49ac2af675696.tar.gz
openshift-3fd3cd3a07d9f000c8cb8bd1b7a49ac2af675696.tar.bz2
openshift-3fd3cd3a07d9f000c8cb8bd1b7a49ac2af675696.tar.xz
openshift-3fd3cd3a07d9f000c8cb8bd1b7a49ac2af675696.zip
Adding a few updates for python27,35 compatibility
Diffstat (limited to 'roles/lib_openshift')
-rw-r--r--roles/lib_openshift/library/oc_edit.py8
-rw-r--r--roles/lib_openshift/library/oc_route.py8
-rw-r--r--roles/lib_openshift/src/lib/base.py8
3 files changed, 12 insertions, 12 deletions
diff --git a/roles/lib_openshift/library/oc_edit.py b/roles/lib_openshift/library/oc_edit.py
index f78cbf2b3..d44f0da88 100644
--- a/roles/lib_openshift/library/oc_edit.py
+++ b/roles/lib_openshift/library/oc_edit.py
@@ -947,14 +947,14 @@ class OpenShiftCLI(object):
try:
rval['results'] = json.loads(stdout)
except ValueError as err:
- if "No JSON object could be decoded" in str(err):
- err = str(err)
+ if "No JSON object could be decoded" in err.args:
+ err = err.args
elif output_type == 'raw':
rval['results'] = stdout
if self.verbose:
- print(stdout)
- print(stderr)
+ print("STDOUT: {0}".format(stdout))
+ print("STDERR: {0}".format(stderr))
if err:
rval.update({"err": err,
diff --git a/roles/lib_openshift/library/oc_route.py b/roles/lib_openshift/library/oc_route.py
index de186ded7..04301a177 100644
--- a/roles/lib_openshift/library/oc_route.py
+++ b/roles/lib_openshift/library/oc_route.py
@@ -951,14 +951,14 @@ class OpenShiftCLI(object):
try:
rval['results'] = json.loads(stdout)
except ValueError as err:
- if "No JSON object could be decoded" in str(err):
- err = str(err)
+ if "No JSON object could be decoded" in err.args:
+ err = err.args
elif output_type == 'raw':
rval['results'] = stdout
if self.verbose:
- print(stdout)
- print(stderr)
+ print("STDOUT: {0}".format(stdout))
+ print("STDERR: {0}".format(stderr))
if err:
rval.update({"err": err,
diff --git a/roles/lib_openshift/src/lib/base.py b/roles/lib_openshift/src/lib/base.py
index 4e9aa4461..915a7caca 100644
--- a/roles/lib_openshift/src/lib/base.py
+++ b/roles/lib_openshift/src/lib/base.py
@@ -230,14 +230,14 @@ class OpenShiftCLI(object):
try:
rval['results'] = json.loads(stdout)
except ValueError as err:
- if "No JSON object could be decoded" in str(err):
- err = str(err)
+ if "No JSON object could be decoded" in err.args:
+ err = err.args
elif output_type == 'raw':
rval['results'] = stdout
if self.verbose:
- print(stdout)
- print(stderr)
+ print("STDOUT: {0}".format(stdout))
+ print("STDERR: {0}".format(stderr))
if err:
rval.update({"err": err,