simplified FileHandler._read_item by returning only the value, not the key

(the key wasn't used anywhere)

Author: gdementen

larray/inout/common.py

@@ -127,8 +127,7 @@ def read(self, keys, *args, **kwargs):
             if display:
                 print("loading", type, "object", key, "...", end=' ')
             try:
-                key, item = self._read_item(key, type, *args, **kwargs)
-                res[key] = item
+                res[key] = self._read_item(key, type, *args, **kwargs)
             except Exception:
                 if not ignore_exceptions:
                     raise

larray/inout/csv.py

@@ -342,11 +342,11 @@ def list_items(self):
 
     def _read_item(self, key, type, *args, **kwargs):
         if type == 'Array':
-            return key, read_csv(self._to_filepath(key), *args, **kwargs)
+            return read_csv(self._to_filepath(key), *args, **kwargs)
         elif type == 'Axis':
-            return key, self.axes[key]
+            return self.axes[key]
         elif type == 'Group':
-            return key, self.groups[key]
+            return self.groups[key]
         else:
             raise TypeError()
 

larray/inout/excel.py

@@ -282,11 +282,11 @@ def list_items(self):
     def _read_item(self, key, type, *args, **kwargs):
         if type == 'Array':
             df = self.handle.parse(key, *args, **kwargs)
-            return key, df_aslarray(df, raw=True)
+            return df_aslarray(df, raw=True)
         elif type == 'Axis':
-            return key, self.axes[key]
+            return self.axes[key]
         elif type == 'Group':
-            return key, self.groups[key]
+            return self.groups[key]
         else:
             raise TypeError()
 
@@ -386,11 +386,11 @@ def list_items(self):
 
     def _read_item(self, key, type, *args, **kwargs):
         if type == 'Array':
-            return key, self.handle[key].load(*args, **kwargs)
+            return self.handle[key].load(*args, **kwargs)
         elif type == 'Axis':
-            return key, self.axes[key]
+            return self.axes[key]
         elif type == 'Group':
-            return key, self.groups[key]
+            return self.groups[key]
         else:
             raise TypeError()
 

larray/inout/hdf.py

@@ -132,7 +132,7 @@ def _read_item(self, key, type, *args, **kwargs):
             kwargs['name'] = key
         else:
             raise TypeError()
-        return key, read_hdf(self.handle, hdf_key, *args, **kwargs)
+        return read_hdf(self.handle, hdf_key, *args, **kwargs)
 
     def _dump_item(self, key, value, *args, **kwargs):
         if isinstance(value, LArray):

larray/inout/pickle.py

@@ -34,8 +34,8 @@ def list_items(self):
         return items
 
     def _read_item(self, key, type, *args, **kwargs):
-        if type in ['Array', 'Axis', 'Group']:
-            return key, self.data[key]
+        if type in {'Array', 'Axis', 'Group'}:
+            return self.data[key]
         else:
             raise TypeError()