Merge pull request influxdata#36 from itd/master

toddboom · toddboom · commit e25939209354 · 2014-06-06T13:55:33.000-04:00
Must decode json in python 3 . Assume default utf8 encoding.
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -255,7 +255,13 @@ def query(self, query, time_precision='s', chunked=False):
             status_code=200
             )
 
-        return json.loads(response.content)
+        try:
+            res = json.loads(response.content)
+        except TypeError:
+            # must decode in python 3 
+            res = json.loads(response.content.decode('utf8'))
+
+        return res
 
     # Creating and Dropping Databases
     #

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,13 @@ def query(self, query, time_precision='s', chunked=False):`
`255`	`255`	`status_code=200`
`256`	`256`	`)`
`257`	`257`
`258`		`- return json.loads(response.content)`
	`258`	`+ try:`
	`259`	`+ res = json.loads(response.content)`
	`260`	`+ except TypeError:`
	`261`	`+ # must decode in python 3`
	`262`	`+ res = json.loads(response.content.decode('utf8'))`
	`263`	`+`
	`264`	`+ return res`
`259`	`265`
`260`	`266`	`# Creating and Dropping Databases`
`261`	`267`	`#`