Merge pull request influxdata#114 from nemesisdesign/0.9.0_support

aviau · aviau · commit cc95370d1239 · 2015-03-05T11:52:07.000-08:00
Updated format_query_response to reflect influxdb 0.9 response (thanks @nemesisdesign!)
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -26,7 +26,6 @@ def __init__(self, content, code):
 
 
 class InfluxDBClient(object):
-
     """
     The ``InfluxDBClient`` object holds information necessary to connect
     to InfluxDB. Requests can be made to InfluxDB directly through the client.
@@ -101,12 +100,11 @@ def __init__(self,
     @staticmethod
     def format_query_response(response):
         """Returns a list of items from a query response"""
-
         series = {}
         if 'results' in response.keys():
             for result in response['results']:
-                if 'rows' in result.keys():
-                    for row in result['rows']:
+                if 'series' in result.keys():
+                    for row in result['series']:
                         items = []
                         if 'name' in row.keys():
                             series[row['name']] = items
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -238,9 +238,9 @@ def test_write_points_with_precision_fails(self):
 
     def test_query(self):
         example_response = \
-            '{"results": [{"rows": [{"name": "sdfsdfsdf", ' \
+            '{"results": [{"series": [{"name": "sdfsdfsdf", ' \
             '"columns": ["time", "value"], "values": ' \
-            '[["2009-11-10T23:00:00Z", 0.64]]}]}, {"rows": ' \
+            '[["2009-11-10T23:00:00Z", 0.64]]}]}, {"series": ' \
             '[{"name": "cpu_load_short", "columns": ["time", "value"], ' \
             '"values": [["2009-11-10T23:00:00Z", 0.64]]}]}]}'
 
@@ -337,7 +337,7 @@ def test_get_list_database(self):
         data = {
             "results":
             [
-                {"rows": [
+                {"series": [
                     {"columns": ["name"],
                      "values":[["mydb"], ["myotherdb"]]}]}
             ]
@@ -357,7 +357,7 @@ def test_get_list_database_fails(self):
 
     def test_get_list_series(self):
         example_response = \
-            '{"results": [{"rows": [{"values": [["fsfdsdf", "24h0m0s", 2]],' \
+            '{"results": [{"series": [{"values": [["fsfdsdf", "24h0m0s", 2]],'\
             ' "columns": ["name", "duration", "replicaN"]}]}]}'
 
         with requests_mock.Mocker() as m:
@@ -412,7 +412,7 @@ def test_create_retention_policy(self):
 
     def test_get_list_retention_policies(self):
         example_response = \
-            '{"results": [{"rows": [{"values": [["fsfdsdf", "24h0m0s", 2]],' \
+            '{"results": [{"series": [{"values": [["fsfdsdf", "24h0m0s", 2]],'\
             ' "columns": ["name", "duration", "replicaN"]}]}]}'
 
         with requests_mock.Mocker() as m:
