diff --git a/openshift/dynamic/client.py b/openshift/dynamic/client.py index adc7e0a7..7c15cb21 100755 --- a/openshift/dynamic/client.py +++ b/openshift/dynamic/client.py @@ -4,6 +4,7 @@ import copy import json from functools import partial +from six import PY2 import yaml from pprint import pformat @@ -50,10 +51,14 @@ def serialize(resource, response): try: return ResourceInstance(resource, load_json(response)) except ValueError: - return response.data.decode() + if PY2: + return response.data + return response.data.decode('utf8') def load_json(response): - return json.loads(response.data.decode()) + if PY2: + return json.loads(response.data) + return json.loads(response.data.decode('utf8')) class DynamicClient(object):