fix some failing tests related to pretty-printing

Author: apdavison

neo/core/spiketrain.py

@@ -347,8 +347,8 @@ def __init__(self, times, t_stop, units=None, dtype=None, copy=True,
 
     def _repr_pretty_(self, pp, cycle):
         waveforms = ""
-        if self.waveforms:
-            waveforms = "with waveforms"
+        if self.waveforms is not None:
+            waveforms = " with waveforms"
         pp.text(f"{self.__class__.__name__} containing {self.size} spikes{waveforms}; "
                 f"units {self.units.dimensionality.string}; datatype {self.dtype} ")
         if self._has_repr_pretty_attrs_():

neo/test/coretest/test_epoch.py

@@ -206,8 +206,10 @@ def test__pretty(self):
         assert_neo_object_is_compliant(epc)
 
         prepr = pretty(epc)
-        targ = ("Epoch\nname: '%s'\ndescription: '%s'\nannotations: %s"
-                "" % (epc.name, epc.description, pretty(epc.annotations)))
+        targ = (f"Epoch containing {len(epc)} epochs with labels; "
+                f"time units {epc.units.dimensionality.string}; datatype float64 "
+                f"\nname: '{epc.name}'\ndescription: '{epc.description}'"
+                f"\nannotations: {pretty(epc.annotations)}")
 
         self.assertEqual(prepr, targ)
 

neo/test/coretest/test_event.py

@@ -473,8 +473,10 @@ def test__pretty(self):
         assert_neo_object_is_compliant(evt)
 
         prepr = pretty(evt)
-        targ = ("Event\nname: '%s'\ndescription: '%s'\nannotations: %s"
-                "" % (evt.name, evt.description, pretty(evt.annotations)))
+        targ = (f"Event containing {len(evt)} events with labels; "
+                f"time units {evt.units.dimensionality.string}; datatype float64 "
+                f"\nname: '{evt.name}'\ndescription: '{evt.description}'"
+                f"\nannotations: {pretty(evt.annotations)}")
 
         self.assertEqual(prepr, targ)
 

neo/test/coretest/test_spiketrain.py

@@ -1973,6 +1973,12 @@ def test__pretty(self):
         res = pretty(self.train1)
         targ = ("SpikeTrain\n" + "name: '%s'\ndescription: '%s'\nannotations: %s"
                                  "" % (self.name1, self.description1, pretty(self.ann1)))
+        targ = (f"SpikeTrain containing {len(self.train1)} spikes with waveforms; "
+                f"units {self.train1.units.dimensionality.string}; datatype float64 "
+                f"\nname: '{self.name1}'\ndescription: '{self.description1}'"
+                f"\nannotations: {pretty(self.ann1)}"
+                f"\ntime: {self.train1.t_start} to {self.train1.t_stop}")
+
         self.assertEqual(res, targ)