diff options
| author | LV-426 <lv-426@taproot.org.il> | 2014-12-14 22:48:13 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2014-12-14 23:15:47 +0200 |
| commit | 292e45dd6590ada4a5155ec4cfe9446610eaf502 (patch) | |
| tree | b50b25c1625b3b5687efbb4eb5c22d671dfb59ab | |
| parent | 2595745df5801e416166d9be1cdc360a226b4476 (diff) | |
rename from_dict -> from_json_dict
| -rw-r--r-- | src-py/model/graph.py | 4 | ||||
| -rw-r--r-- | src-py/rhizi_api.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src-py/model/graph.py b/src-py/model/graph.py index b40b805a..ebe8b31e 100644 --- a/src-py/model/graph.py +++ b/src-py/model/graph.py @@ -83,7 +83,7 @@ class Topo_Diff(object): pass @staticmethod - def from_dict(topo_diff_dict): + def from_json_dict(json_dict): """ construct from dict - no node/link constructor set must be provided """ @@ -92,7 +92,7 @@ class Topo_Diff(object): # merge keys - this allows constructor argument omission (link_set_rm, # node_set_rm, etc.) such as when constructing from POST JSON data for k, _ in ret.__dict__.items(): - v = topo_diff_dict.get(k) + v = json_dict.get(k) if None != v: ret.__dict__[k] = v return ret diff --git a/src-py/rhizi_api.py b/src-py/rhizi_api.py index b89e8c18..228fcd66 100644 --- a/src-py/rhizi_api.py +++ b/src-py/rhizi_api.py @@ -151,7 +151,7 @@ def diff_commit__set(): def sanitize_input(req): diff_set_dict = request.get_json()['diff_set'] topo_diff_dict = diff_set_dict['__diff_set_topo'][0] - topo_diff = Topo_Diff.from_dict(topo_diff_dict) + topo_diff = Topo_Diff.from_json_dict(topo_diff_dict) sanitize_input__topo_diff(topo_diff) return topo_diff; @@ -166,7 +166,7 @@ def diff_commit__topo(): """ def sanitize_input(req): topo_diff_dict = request.get_json()['topo_diff'] - topo_diff = Topo_Diff.from_dict(topo_diff_dict) + topo_diff = Topo_Diff.from_json_dict(topo_diff_dict) sanitize_input__topo_diff(topo_diff) return topo_diff; |