diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-17 12:48:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-17 12:48:11 -0500 |
| commit | 31eabf5d41c706270a347fad676cb74288aa5813 (patch) | |
| tree | 17588651225c43044498eaed072c204d1cee7040 /roles/lib_openshift/library/oc_obj.py | |
| parent | dddc65c10517d0f56070dedc9ab2db59792a7c3c (diff) | |
| parent | a4834fcc357c4042ef3fb1bc0c588a478a2d0915 (diff) | |
| download | openshift-31eabf5d41c706270a347fad676cb74288aa5813.tar.gz openshift-31eabf5d41c706270a347fad676cb74288aa5813.tar.bz2 openshift-31eabf5d41c706270a347fad676cb74288aa5813.tar.xz openshift-31eabf5d41c706270a347fad676cb74288aa5813.zip | |
Merge pull request #3403 from kwoodson/lib_openshift_compat
Compatibility for python2,3.
Diffstat (limited to 'roles/lib_openshift/library/oc_obj.py')
| -rw-r--r-- | roles/lib_openshift/library/oc_obj.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/lib_openshift/library/oc_obj.py b/roles/lib_openshift/library/oc_obj.py index d6f088f32..6d0b391b9 100644 --- a/roles/lib_openshift/library/oc_obj.py +++ b/roles/lib_openshift/library/oc_obj.py @@ -964,7 +964,7 @@ class OpenShiftCLI(object): stdout, stderr = proc.communicate(input_data) - return proc.returncode, stdout, stderr + return proc.returncode, stdout.decode(), stderr.decode() # pylint: disable=too-many-arguments,too-many-branches def openshift_cmd(self, cmd, oadm=False, output=False, output_type='json', input_data=None): |