Merge pull request #915 from VisLab/develop

Changed the behavior of None in to_strlist

hed/tools/analysis/annotation_util.py

@@ -219,7 +219,7 @@ def to_strlist(obj_list):
     """
 
     # Using list comprehension to convert non-None items to strings
-    return [str(item) if item is not None else None for item in obj_list]
+    return [str(item) if item is not None else '' for item in obj_list]
 
 
 def _flatten_cat_col(col_key, col_dict):

tests/tools/analysis/test_annotation_util.py

@@ -310,19 +310,19 @@ def test_strs_to_tabular(self):
         tab_in = str_to_tabular(events_contents, sidecar=self.json_path)
         self.assertIsInstance(tab_in, TabularInput)
 
-    def test_convert_to_strlist(self):
+    def test_to_strlist(self):
         # schema
         # list1 = [HedString('Red, Sensory-event', schema)]
         list1 = ['abc', '', None, 3.24]
         str_list1 = to_strlist(list1)
         self.assertEqual(len(str_list1), len(list1))
-        self.assertIsNone(str_list1[2], None)
+        self.assertFalse(str_list1[2])
         self.assertEqual(str_list1[3], '3.24')
         self.assertFalse(str_list1[1])
         list2 = [HedString('Red, Sensory-event', self.hed_schema), None, HedString('', self.hed_schema)]
         str_list2 = to_strlist(list2)
         self.assertEqual(len(str_list2), len(list2))
-        self.assertIsNone(str_list2[1], None)
+        self.assertFalse(str_list2[1])
         self.assertEqual(str_list2[0], 'Red,Sensory-event')
         self.assertEqual(str_list2[2], '')