From cb99b61f43fcbcefadd76ec4c7f73e75a31cf9df Mon Sep 17 00:00:00 2001 From: lukasheinrich Date: Wed, 18 Oct 2017 09:26:06 -0500 Subject: [PATCH] state: allow deserialization options --- packtivity/backendutils.py | 2 +- packtivity/cli.py | 4 ++-- packtivity/statecontexts/__init__.py | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packtivity/backendutils.py b/packtivity/backendutils.py index 300fe5b..83294f0 100644 --- a/packtivity/backendutils.py +++ b/packtivity/backendutils.py @@ -8,7 +8,7 @@ log = logging.getLogger(__name__) -def proxy_from_json(jsondata, deserialization_opts = None, best_effort_backend = True, raise_on_unknown = False): +def load_proxy(jsondata, deserialization_opts = None, best_effort_backend = True, raise_on_unknown = False): deserialization_opts = deserialization_opts or {} proxy, backend = None, None if jsondata['proxyname'] == 'CeleryProxy': diff --git a/packtivity/cli.py b/packtivity/cli.py index d0f42ef..501d0fe 100644 --- a/packtivity/cli.py +++ b/packtivity/cli.py @@ -109,7 +109,7 @@ def validatecli(spec,toplevel,schemasource,schemaname,show): @click.argument('jsonfile') def checkproxy(jsonfile): proxydata = json.load(open(jsonfile)) - proxy, backend = bkutils.proxy_from_json(proxydata, best_effort_backend = True) + proxy, backend = bkutils.load_proxy(proxydata, best_effort_backend = True) ready = backend.ready(proxy) @@ -119,4 +119,4 @@ def checkproxy(jsonfile): click.secho('successful: {}'.format(successful)) if successful: result = backend.result(proxy) - click.secho('result: {}'.format(json.dumps(result))) \ No newline at end of file + click.secho('result: {}'.format(json.dumps(result))) diff --git a/packtivity/statecontexts/__init__.py b/packtivity/statecontexts/__init__.py index 3658675..2052392 100644 --- a/packtivity/statecontexts/__init__.py +++ b/packtivity/statecontexts/__init__.py @@ -10,7 +10,8 @@ def load_state(jsondata): return module.load_state(jsondata) raise TypeError('unknown state type {}'.format(jsondata['state_type'])) -def load_provider(jsondata): +def load_provider(jsondata,deserialization_opts = None): + deserialization_opts = deserialization_opts or {} if jsondata == None: return None if jsondata['state_provider_type'] == 'localfs_provider':