Merge pull request influxdata#71 from jonashaag/patch-1

aviau · aviau · commit 991ef5bb5b55 · 2014-10-30T11:56:30.000-04:00
Fix json decoding on Python 3 (thanks @jonashaag)
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -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
     #
@@ -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):
         """
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -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
 
 

Original file line number	Diff line number	Diff line change
`@@ -322,13 +322,7 @@ def query(self, query, time_precision='s', chunked=False):`
`322`	`322`	`status_code=200`
`323`	`323`	`)`
`324`	`324`
`325`		`- try:`
`326`		`- res = json.loads(response.content)`
`327`		`- except TypeError:`
`328`		`- # must decode in python 3`
`329`		`- res = json.loads(response.content.decode('utf8'))`
`330`		`-`
`331`		`- return res`
	`325`	`+ return response.json()`
`332`	`326`
`333`	`327`	`# Creating and Dropping Databases`
`334`	`328`	`#`
`@@ -396,7 +390,7 @@ def get_database_list(self):`
`396`	`390`	`status_code=200`
`397`	`391`	`)`
`398`	`392`
`399`		`- return json.loads(response.content)`
	`393`	`+ return response.json()`
`400`	`394`
`401`	`395`	`def delete_series(self, series):`
`402`	`396`	`"""`