Merge pull request #1051 from apdavison/fix-getitem-slice-none

Fix exception raised when calling pyplot.plot(sig.times, sig) if the signal has array annotations

Author: JuliaSprenger

neo/core/analogsignal.py

@@ -265,6 +265,10 @@ def __getitem__(self, i):
                     raise TypeError("%s not supported" % type(j))
                 if isinstance(k, (int, np.integer)):
                     obj = obj.reshape(-1, 1)
+                elif k is None:
+                    # matplotlib _check_1d() calls__getitem__ with (:, None) and
+                    # reacts appropriately if an IndexError or ValueError is raised
+                    raise IndexError("Cannot add dimensions to an AnalogSignal")
                 obj.array_annotate(**deepcopy(self.array_annotations_at_index(k)))
         elif isinstance(i, slice):
             obj = super().__getitem__(i)

neo/test/coretest/test_analogsignal.py

@@ -639,6 +639,9 @@ def test__getitem_should_return_single_quantity(self):
         self.assertTrue(hasattr(self.signal1[9, 3], 'units'))
         self.assertRaises(IndexError, self.signal1.__getitem__, (99, 73))
 
+    def test__getitem__with_tuple_slice_none(self):
+        self.assertRaises(IndexError, self.signal1.__getitem__, (slice(None), None))
+
     def test__time_index(self):
         # scalar arguments
         self.assertEqual(self.signal2.time_index(2.0 * pq.s), 2)