diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-04 13:32:53 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-04 13:32:53 -0500 |
commit | a893d4fab69a45be6782ce2d0161162acca04226 (patch) | |
tree | 7416cb0d6718af653292098e5ace282bfb725e78 /roles/lib_openshift/library/oc_adm_manage_node.py | |
parent | a04128cf36792640a84ad0e1914922dffbf2bd5c (diff) | |
parent | 339904aeecdbc8e7d718d58a97620def9a549f06 (diff) | |
download | openshift-a893d4fab69a45be6782ce2d0161162acca04226.tar.gz openshift-a893d4fab69a45be6782ce2d0161162acca04226.tar.bz2 openshift-a893d4fab69a45be6782ce2d0161162acca04226.tar.xz openshift-a893d4fab69a45be6782ce2d0161162acca04226.zip |
Merge pull request #4089 from mtnbikenc/unicode-decode
Merged by openshift-bot
Diffstat (limited to 'roles/lib_openshift/library/oc_adm_manage_node.py')
-rw-r--r-- | roles/lib_openshift/library/oc_adm_manage_node.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/lib_openshift/library/oc_adm_manage_node.py b/roles/lib_openshift/library/oc_adm_manage_node.py index 0930faadb..ae5806137 100644 --- a/roles/lib_openshift/library/oc_adm_manage_node.py +++ b/roles/lib_openshift/library/oc_adm_manage_node.py @@ -1066,7 +1066,7 @@ class OpenShiftCLI(object): stdout, stderr = proc.communicate(input_data) - return proc.returncode, stdout.decode(), stderr.decode() + return proc.returncode, stdout.decode('utf-8'), stderr.decode('utf-8') # pylint: disable=too-many-arguments,too-many-branches def openshift_cmd(self, cmd, oadm=False, output=False, output_type='json', input_data=None): |