Skip to content

[release-0.6] Do not decode response data in Python2 #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2019
Merged

[release-0.6] Do not decode response data in Python2 #329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions openshift/dynamic/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import sys
import json
from functools import partial
from six import PY2

import yaml
from pprint import pformat
Expand Down Expand Up @@ -41,10 +42,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):
Expand Down