Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Fix json decoding on Python 3 #71

Merged
merged 2 commits into from
Oct 30, 2014
Merged

Fix json decoding on Python 3 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d196ae6
Fix json decoding on Python 3
jonashaag Oct 29, 2014
f174e27
Fix mock session for tests
jonashaag Oct 30, 2014
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
10 changes: 2 additions & 8 deletions influxdb/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,13 +322,7 @@ def query(self, query, time_precision='s', chunked=False):
status_code=200
)

try:
res = json.loads(response.content)
except TypeError:
# must decode in python 3
res = json.loads(response.content.decode('utf8'))

return res
return response.json()

# Creating and Dropping Databases
#
Expand Down Expand Up @@ -396,7 +390,7 @@ def get_database_list(self):
status_code=200
)

return json.loads(response.content)
return response.json()

def delete_series(self, series):
"""
Expand Down
2 changes: 1 addition & 1 deletion tests/influxdb/client_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
def _build_response_object(status_code=200, content=""):
resp = requests.Response()
resp.status_code = status_code
resp._content = content
resp._content = content.encode("utf8")
return resp


Expand Down