Use json_loads_or_raw in swf.Executor

Signed-off-by: Yves Bastide <yves@botify.com>

Author: ybastide

simpleflow/swf/executor.py

@@ -22,17 +22,21 @@
 from simpleflow.history import History
 from simpleflow.marker import Marker
 from simpleflow.signal import WaitForSignal
+from simpleflow.swf import constants
 from simpleflow.swf.helpers import swf_identity
 from simpleflow.swf.task import ActivityTask, WorkflowTask, SignalTask, MarkerTask, SwfTask
 from simpleflow.task import (
     ActivityTask as BaseActivityTask,
     WorkflowTask as BaseWorkflowTask,
     SignalTask as BaseSignalTask,
     MarkerTask as BaseMarkerTask,
+from simpleflow.utils import (
+    hex_hash,
+    issubclass_,
+    json_dumps,
+    json_loads_or_raw,
+    retry,
 )
-from simpleflow.utils import issubclass_, json_dumps, hex_hash
-from simpleflow.swf import constants
-from simpleflow.utils import retry
 from simpleflow.workflow import Workflow
 from swf.core import ConnectedSWFObject
 
@@ -264,7 +268,7 @@ def _get_future_from_activity_event(self, event):
             future.set_running()
         elif state == 'completed':
             result = event['result']
-            future.set_finished(json.loads(result) if result else None)
+            future.set_finished(json_loads_or_raw(result))
         elif state == 'canceled':
             future.set_cancelled()
         elif state == 'failed':
@@ -318,7 +322,7 @@ def _get_future_from_child_workflow_event(self, event):
         elif state == 'started':
             future.set_running()
         elif state == 'completed':
-            future.set_finished(json.loads(event['result']))
+            future.set_finished(json_loads_or_raw(event['result']))
         elif state == 'failed':
             future.set_exception(exceptions.TaskFailed(
                 name=event['id'],
@@ -1056,10 +1060,13 @@ def record_marker(self, name, details=None):
 
     def list_markers(self, all=False):
         if all:
-            return [Marker(m['name'], json.loads(m['details'])) for ml in self._history.markers.values() for m in ml]
+            return [
+                Marker(m['name'], json_loads_or_raw(m['details']))
+                for ml in self._history.markers.values() for m in ml
+            ]
         rc = []
         for ml in self._history.markers.values():
             m = ml[-1]
             if m['state'] == 'recorded':
-                rc.append(Marker(m['name'], json.loads(m['details'])))
+                rc.append(Marker(m['name'], json_loads_or_raw(m['details'])))
         return rc