Merge pull request influxdata#2 from william-p/json

jvshahid · jvshahid · commit b230c83d1228 · 2013-11-13T10:43:42.000-08:00
Use json method of 'requests' for return results
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -186,7 +186,7 @@ def query(self, query, time_precision='s', chunked=False):
             chunked_param))
 
         if response.status_code == 200:
-            return response.content
+            return response.json()
         else:
             raise Exception(
                 "{0}: {1}".format(response.status_code, response.content))
@@ -284,7 +284,7 @@ def get_list_cluster_admins(self):
                 self._password))
 
         if response.status_code == 200:
-            return json.loads(response.content)
+            return response.json()
         else:
             raise Exception(
                 "{0}: {1}".format(response.status_code, response.content))
@@ -449,7 +449,7 @@ def get_database_users(self):
                 self._password))
 
         if response.status_code == 200:
-            return json.loads(response.content)
+            return response.json()
         else:
             raise Exception(
                 "{0}: {1}".format(response.status_code, response.content))
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -106,7 +106,7 @@ def test_query(self):
                 content=expected)
             cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
             result = cli.query('select column_one from foo;')
-            assert len(json.loads(result)[0]['points']) == 4
+            assert len(result[0]['points']) == 4
 
     @raises(Exception)
     def test_query_fail(self):
