change output format for mget to dict

Author: Александр Игоревич Корочкин

redistimeseries/client.py

@@ -48,14 +48,13 @@ def parse_get(response):
     return (int(response[0]), float(response[1]))
 
 def parse_m_get(response):
-    res = []
+    res = dict()
     for item in response:
         if item[2] == []:
-            res.append({ nativestr(item[0]) : [list_to_dict(item[1]), None, None]})
+            res[nativestr(item[0])] = (list_to_dict(item[1]), None, None)
         else:
-            res.append({ nativestr(item[0]) : [list_to_dict(item[1]),
-                                int(item[2][0]), float(item[2][1])]})
-
+            res[nativestr(item[0])] = (list_to_dict(item[1]),
+                                       int(item[2][0]), float(item[2][1]))
     return res
 
 def parseToList(response):

test_commands.py

@@ -10,7 +10,7 @@
 class RedisTimeSeriesTest(TestCase):
     def setUp(self):
         global rts
-        rts = RedisTimeSeries(port=port)
+        rts = RedisTimeSeries(host='200.1.3.7', port=port)
         rts.flushdb()
 
     def testCreate(self):
@@ -154,20 +154,20 @@ def testMGet(self):
         rts.create(1, labels={'Test':'This'})
         rts.create(2, labels={'Test':'This', 'Taste':'That'})
         act_res = rts.mget(['Test=This'])
-        exp_res = [{'1': [{}, None, None]}, {'2': [{}, None, None]}]
+        exp_res = {'1': ({}, None, None), '2': ({}, None, None)}
         self.assertEqual(act_res, exp_res)
         rts.add(1, '*', 15)
         rts.add(2, '*', 25)
         res = rts.mget(['Test=This'])
-        self.assertEqual(15, res[0]['1'][2])
-        self.assertEqual(25, res[1]['2'][2])
+        self.assertEqual(15, res['1'][2])
+        self.assertEqual(25, res['2'][2])
         res = rts.mget(['Taste=That'])
-        self.assertEqual(25, res[0]['2'][2])
+        self.assertEqual(25, res['2'][2])
 
         # test with_labels
-        self.assertEqual({}, res[0]['2'][0])
+        self.assertEqual({}, res['2'][0])
         res = rts.mget(['Taste=That'], with_labels=True)
-        self.assertEqual({'Taste': 'That', 'Test': 'This'}, res[0]['2'][0])
+        self.assertEqual({'Taste': 'That', 'Test': 'This'}, res['2'][0])
 
     def testInfo(self):
         '''Test TS.INFO calls'''