fixed the case where VG(key) is not in Axis but key is in Axis

gdementen · gdementen · commit 430264de4429 · 2015-08-04T13:19:56.000+02:00
The problem is that "VG(key) in axis" returns True
diff --git a/larray/core.py b/larray/core.py
@@ -1292,12 +1292,22 @@ def __array__(self, dtype=None):
     def _translate_axis_key(self, axis, key):
         # we do not use axis.translate because we have to let Pandas do the
         # label -> position conversion
-        if key in axis:
-            return key
-
         if isinstance(key, ValueGroup):
+            # this case is tricky because axis.__contains__(VG) use VG.key
+            # (because of the way VG.__hash__ is implemented), which means
+            # VG.key in axis => VG in axis even though only VG.key is really
+            # in the actual Axis ticks (and Pandas Index) and NOT the VG itself
+            if key in axis:
+                # we check if the VG itself is *really* in the axis
+                idx = axis.translate(key)
+                if isinstance(axis.labels[idx], ValueGroup):
+                    return key
+
             key = key.key
 
+        if key in axis:
+            return key
+
         return to_key(key)
 
     #XXX: we only need axes length, so we might want to move this out of the
