Merge pull request #557 from GavinHuttley/develop

Table tweaks
cogent3 · Mar 5, 2020 · 3af1913 · 3af1913
2 parents f5fed68 + e73111e
commit 3af1913
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/cogent3/util/table.py b/src/cogent3/util/table.py
@@ -239,8 +239,9 @@ def cast_to_array(values):
     dtype = "U" if types == {str} else None
     try:
         result = numpy.array(values, dtype=dtype)
-    except:
+    except Exception:
         result = numpy.array(values, dtype=object)
+
     return result
 
 
@@ -381,6 +382,7 @@ def __len__(self):
         return len(self._order)
 
     def __setitem__(self, key, val):
+        key = str(key)
         if isinstance(val, str):
             val = [val]
         try:

diff --git a/tests/test_util/test_table.py b/tests/test_util/test_table.py
@@ -99,6 +99,11 @@ def test_empty(self):
             self.assertEqual(len(t), 0)
             self.assertEqual(t.shape, (0, 2), f"failed with {data}")
 
+    def test_keys_are_str(self):
+        """all column headers converted to str"""
+        t = Table(header=["col 1", 2], data=[[0, 1]])
+        self.assertEqual(t.header, ("col 1", "2"))
+
     def test_no_index_name(self):
         """assigning None has no effect"""
         t = Table(header=self.t5_header, data=self.t5_rows)