fixes #106, tuple getitem

Author: betaBison

gnss_lib_py/parsers/navdata.py

@@ -1400,7 +1400,8 @@ def _parse_key_idx(self, key_idx):
             self.in_rows(key_idx)
             rows = [self.map[key_idx]]
             cols = slice(None, None)
-        elif isinstance(key_idx, list) and isinstance(key_idx[0], str):
+        elif isinstance(key_idx, (list,tuple)) \
+            and all(isinstance(idx, str) for idx in key_idx):
             rows = [self.map[k] for k in key_idx]
             cols = slice(None, None)
         elif isinstance(key_idx, slice):
@@ -1421,7 +1422,7 @@ def _parse_key_idx(self, key_idx):
             elif isinstance(key_idx[0], int):
                 rows = [key_idx[0]]
             else:
-                if not isinstance(key_idx[0],list):
+                if not isinstance(key_idx[0],(tuple,list)):
                     row_key = [key_idx[0]]
                 else:
                     row_key = key_idx[0]

tests/parsers/test_navdata.py

@@ -903,12 +903,19 @@ def fixture_flt_int_slc(df_rows):
                         (('integers', slice(None, None)),
                           lazy_fixture('integers')),
                         (['integers', 'floats'], lazy_fixture('int_flt')),
+                        (('integers', 'floats'), lazy_fixture('int_flt')),
+                        ((['integers', 'floats'], 0), np.array([10., 0.5])),
+                        ((('integers', 'floats'), 0), np.array([10., 0.5])),
                         (('integers', 0), 10.),
                         (('strings', 0), np.asarray([['gps']], dtype=object)),
                         (['names', 'strings'], lazy_fixture('nm_str')),
+                        (('names', 'strings'), lazy_fixture('nm_str')),
                         (['strings', 'names'], lazy_fixture('str_nm')),
+                        (('strings', 'names'), lazy_fixture('str_nm')),
                         ((['integers', 'floats'], slice(3, None)),
                            lazy_fixture('flt_int_slc')),
+                        ((('integers', 'floats'), slice(3, None)),
+                           lazy_fixture('flt_int_slc')),
                         (1, lazy_fixture('integers'))
                         ])
 def test_get_item(data, index, exp_value):