Merge pull request #934 from mcdo0486/fix/results_typecheck

Regression: fix CSVFormatter.format not recording np.float types

pymeasure/experiment/results.py

@@ -121,8 +121,6 @@ def unique_filename(directory, prefix='DATA', suffix='', ext='csv',
 class CSVFormatter(logging.Formatter):
     """ Formatter of data results """
 
-    numeric_types = (float, int, Decimal)
-
     def __init__(self, columns, delimiter=','):
         """Creates a csv formatter for a given list of columns (=header).
 
@@ -146,7 +144,7 @@ def format(self, record):
         line = []
         for x in self.columns:
             value = record.get(x, float("nan"))
-            if type(value) in self.numeric_types:
+            if isinstance(value, (float, int, Decimal)) and type(value) is not bool:
                 line.append(f"{value}")
             else:
                 units = self.units.get(x, None)

tests/experiment/test_results.py

@@ -70,7 +70,9 @@ def test_csv_formatter_format(self):
                               ('magnetic (T)', 7, "7"),
                               ('string', "abcdef", "abcdef"),
                               ('count', 9 * ureg.dimensionless, "9"),
-                              ('boolean', True, "True")
+                              ('boolean', True, "True"),
+                              ('numpy (V)', np.float64(1.1), "1.1"),
+                              ('boolean nan (V)', True, "nan"),
                               ))
     def test_unitful(self, head, value, result):
         """Test, whether units are appended correctly"""