tsipa
diff --git a/‎influxdb/point.py
Lines changed: 0 additions & 77 deletions b/‎influxdb/point.py
Lines changed: 0 additions & 77 deletions
diff --git a/‎influxdb/resultset.py
Lines changed: 10 additions & 5 deletions b/‎influxdb/resultset.py
Lines changed: 10 additions & 5 deletions
diff --git a/‎tests/influxdb/point_test.py
Lines changed: 0 additions & 44 deletions b/‎tests/influxdb/point_test.py
Lines changed: 0 additions & 44 deletions
diff --git a/‎tests/influxdb/resultset_test.py
Lines changed: 18 additions & 29 deletions b/‎tests/influxdb/resultset_test.py
Lines changed: 18 additions & 29 deletions
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from influxdb.point import Point
-
 _sentinel = object()
 
 
@@ -43,15 +41,15 @@ def __getitem__(self, key):
                 # like 'show retention policies' ..
                 if key is None:
                     for point in serie['values']:
-                        yield Point(None, serie['columns'], point)
+                        yield self.point_from_cols_vals(serie['columns'], point)
 
             elif name in (None, serie_name):
                 # by default if no tags was provided then
                 # we will matches every returned serie
                 serie_tags = serie.get('tags', {})
                 if tags is None or self._tag_matches(serie_tags, tags):
                     for point in serie['values']:
-                        yield Point(serie_name, serie['columns'], point, serie_tags)
+                        yield self.point_from_cols_vals(serie['columns'], point)
 
     def __repr__(self):
         return str(self.raw)
@@ -101,4 +99,11 @@ def items(self):
             items.append(
                 (serie_key, self[serie_key])
             )
-        return items
+        return items
+
+    @staticmethod
+    def point_from_cols_vals(cols, vals):
+        point = {}
+        for col_index, col_name in enumerate(cols):
+            point[col_name] = vals[col_index]
+        return point
@@ -3,7 +3,6 @@
 import unittest
 
 from influxdb.resultset import ResultSet
-from influxdb.point import Point
 
 
 class TestResultSet(unittest.TestCase):
@@ -40,36 +39,22 @@ def test_filter_by_name(self):
         self.assertEqual(
             list(self.rs['cpu_load_short']),
             [
-                Point("cpu_load_short", ["time", "value"],
-                      ["2015-01-29T21:51:28.968422294Z", 0.64],
-                      tags={"host": "server01", "region": "us-west"}),
-                Point("cpu_load_short", ["time", "value"],
-                      ["2015-01-29T21:51:28.968422294Z", 0.64],
-                      tags={"host": "server02", "region": "us-west"})
+                {'value': 0.64, 'time': '2015-01-29T21:51:28.968422294Z'},
+                {'value': 0.64, 'time': '2015-01-29T21:51:28.968422294Z'}
             ]
         )
 
     def test_filter_by_tags(self):
         self.assertEqual(
             list(self.rs[('cpu_load_short', {"host": "server01"})]),
-            [
-                Point(
-                    "cpu_load_short", ["time", "value"],
-                    ["2015-01-29T21:51:28.968422294Z", 0.64],
-                    tags={"host": "server01", "region": "us-west"}
-                )
-            ]
+            [{'time': '2015-01-29T21:51:28.968422294Z', 'value': 0.64}]
         )
 
         self.assertEqual(
             list(self.rs[('cpu_load_short', {"region": "us-west"})]),
             [
-                Point("cpu_load_short", ["time", "value"],
-                      ["2015-01-29T21:51:28.968422294Z", 0.64],
-                      tags={"host": "server01", "region": "us-west"}),
-                Point("cpu_load_short", ["time", "value"],
-                      ["2015-01-29T21:51:28.968422294Z", 0.64],
-                      tags={"host": "server02", "region": "us-west"}),
+                {'value': 0.64, 'time': '2015-01-29T21:51:28.968422294Z'},
+                {'value': 0.64, 'time': '2015-01-29T21:51:28.968422294Z'}
             ]
         )
 
@@ -98,21 +83,25 @@ def test_items(self):
             [
                 (
                     ('cpu_load_short', {'host': 'server01', 'region': 'us-west'}),
-                    [Point("cpu_load_short", ["time", "value"],
-                           ["2015-01-29T21:51:28.968422294Z", 0.64],
-                           tags={"host": "server01", "region": "us-west"})]
+                    [{'value': 0.64, 'time': '2015-01-29T21:51:28.968422294Z'}]
                 ),
                 (
                     ('cpu_load_short', {'host': 'server02', 'region': 'us-west'}),
-                    [Point("cpu_load_short", ["time", "value"],
-                           ["2015-01-29T21:51:28.968422294Z", 0.64],
-                           tags={"host": "server02", "region": "us-west"})]
+                    [{'value': 0.64, 'time': '2015-01-29T21:51:28.968422294Z'}]
                 ),
                 (
                     ('other_serie', {'host': 'server01', 'region': 'us-west'}),
-                    [Point("other_serie", ["time", "value"],
-                           ["2015-01-29T21:51:28.968422294Z", 0.64],
-                           tags={"host": "server01", "region": "us-west"})]
+                    [{'value': 0.64, 'time': '2015-01-29T21:51:28.968422294Z'}]
                 )
             ]
         )
+
+    def test_point_from_cols_vals(self):
+        cols = ['col1', 'col2']
+        vals = [1, '2']
+
+        point = ResultSet.point_from_cols_vals(cols, vals)
+        self.assertDictEqual(
+            point,
+            {'col1': 1, 'col2': '2'}
+        )