cleanup

Author: gdementen

larray/core/array.py

@@ -2127,11 +2127,9 @@ def _translate_axis_key(self, axis_key):
             return self._translate_axis_key_chunk(axis_key)
 
     def __getitem__(self, key, collapse_slices=False, translate_key=True):
-        data = self.data
-        # FIXME: I have a huge problem with boolean axis labels + non points
         raw_broadcasted_key, res_axes, transpose_indices = self.axes._key_to_raw_and_axes(key, collapse_slices,
                                                                                           translate_key)
-        res_data = data[raw_broadcasted_key]
+        res_data = self.data[raw_broadcasted_key]
         if res_axes:
             res = Array(res_data, res_axes)
             # if some axes have been moved in front because of advanced indexing, we transpose them back to their
@@ -2145,7 +2143,6 @@ def __setitem__(self, key, value, collapse_slices=True, translate_key=True):
         # total_axes = self.axes + key.axes + value.axes
         # expanded = self.expand(total_axes)
         # data = np.asarray(expanded.data)
-        data = self.data
         raw_broadcasted_key, target_axes, _ = self.axes._key_to_raw_and_axes(key, collapse_slices, translate_key)
         if isinstance(value, Array):
             # TODO: the check_compatible should be included in broadcast_with
@@ -2161,7 +2158,7 @@ def __setitem__(self, key, value, collapse_slices=True, translate_key=True):
                 text = 'axes are' if len(extra_axes) > 1 else 'axis is'
                 raise ValueError("Value {!s} {} not present in target subset {!s}. A value can only have the same axes "
                                  "or fewer axes than the subset being targeted".format(extra_axes, text, axes))
-        data[raw_broadcasted_key] = value
+        self.data[raw_broadcasted_key] = value
 
         # concerning keys this can make sense in several cases:
         # single bool Array key with extra axes.

larray/core/axis.py

@@ -2563,18 +2563,17 @@ def _translate_axis_key_chunk(self, axis_key):
         """
         axis_key = remove_nested_groups(axis_key)
 
-        if isinstance(axis_key, Group) and axis_key.axis is not None:
+        if isinstance(axis_key, IGroup) and axis_key.axis is not None:
             # retarget to real axis, if needed
             # only retarget IGroup and not LGroup to give the opportunity for axis.translate to try the "ticks"
             # version of the group ONLY if key.axis is not real_axis (for performance reasons)
-            if isinstance(axis_key, IGroup):
-                if axis_key.axis in self:
-                    axis_key = axis_key.retarget_to(self[axis_key.axis])
-                else:
-                    # axis associated with axis_key may not belong to self.
-                    # In that case, we translate IGroup to labels and search for a compatible axis
-                    # (see end of this method)
-                    axis_key = axis_key.to_label()
+            if axis_key.axis in self:
+                axis_key = axis_key.retarget_to(self[axis_key.axis])
+            else:
+                # axis associated with axis_key may not belong to self.
+                # In that case, we translate IGroup to labels and search for a compatible axis
+                # (see end of this method)
+                axis_key = axis_key.to_label()
 
         # already positional
         if isinstance(axis_key, IGroup):