Merge branch 'master' into noinherit

gdementen · gdementen · commit de9eb5a4db1a · 2015-01-30T12:06:41.000+01:00
diff --git a/larray/core.py b/larray/core.py
@@ -730,8 +730,8 @@ def __eq__(self, other):
         other collection compares equal if all axes compare equal and in the
         same order. Works with a list.
         """
-        if isinstance(other, AxisCollection):
-            other = other._list
+        if not isinstance(other, list):
+            other = list(other)
         return self._list == other
 
     def __contains__(self, key):
diff --git a/larray/tests/test_la.py b/larray/tests/test_la.py
@@ -373,6 +373,13 @@ def setUp(self):
         self.value = Axis('value', ':10')
         self.collection = AxisCollection((self.lipro, self.sex, self.age))
 
+    def test_eq(self):
+        col = self.collection
+        self.assertEqual(col, col)
+        self.assertEqual(col, AxisCollection((self.lipro, self.sex, self.age)))
+        self.assertEqual(col, (self.lipro, self.sex, self.age))
+        self.assertNotEqual(col, (self.lipro, self.age, self.sex))
+
     def test_getitem_name(self):
         col = self.collection
         self.assertEqual(col['lipro'], self.lipro)
@@ -600,7 +607,10 @@ def test_getitem(self):
         lipro159 = lipro['P01,P05,P09']
 
         # ValueGroup at "correct" place
-        self._assert_equal_raw(la[age159], raw[[1, 5, 9]])
+        subset = la[age159]
+        self.assertEqual(subset.axes[1:], (geo, sex, lipro))
+        self.assertEqual(subset.axes[0], Axis('age', ['1', '5', '9']))
+        self._assert_equal_raw(subset, raw[[1, 5, 9]])
 
         # ValueGroup at "incorrect" place
         self._assert_equal_raw(la[lipro159], raw[..., [0, 4, 8]])
