Merge pull request #452 from ChristopherBradley/449

ENH: deserialise_result handles tuples as keys

src/cogent3/util/deserialise.py

@@ -113,7 +113,10 @@ def deserialise_result(data):
         # required
         if type(value) == dict and "app.result" in str(value.get("type")):
             value = deserialise_object(value)
-        result[key] = value
+        try:
+            result[key] = value
+        except TypeError:
+            result[tuple(key)] = value
     return result
 
 

tests/test_util/test_deserialise.py

@@ -247,6 +247,15 @@ def test_roundtrip_model_result(self):
         self.assertNotIsInstance(got_obj.lf, dict)
         self.assertEqual(got_obj.lf.nfp, got_obj.nfp)
 
+    def test_roundtrip_tuple_key(self):
+        """deserialise_result handles tuples as keys"""
+        from cogent3.app.result import generic_result
+
+        r = generic_result(source="none")
+        r[(1, 2)] = 24
+        got = deserialise_object(r.to_json())
+        self.assertEqual(got[(1, 2)], 24)
+
     def test_not_completed_result(self):
         """correctly reconstructs a NotCompletedResult object"""
         from cogent3.app.composable import NotCompleted