From 076d3bfe539fe53458295d58ead91928280a6fd1 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sun, 11 Jan 2015 12:59:23 +0200 Subject: server/Topo_Diff: use link_id_set_rm and node_id_set_rm To distinguish id sets from Node/Link sets. Closes #250 --- src/server/model/graph.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/model') diff --git a/src/server/model/graph.py b/src/server/model/graph.py index 76368a24..430ffd13 100644 --- a/src/server/model/graph.py +++ b/src/server/model/graph.py @@ -105,19 +105,19 @@ class Topo_Diff(object): return obj.to_json_dict() def to_json_dict(self): - ret = {k: getattr(self, k) for k in ['link_set_rm', - 'node_set_rm', + ret = {k: getattr(self, k) for k in ['link_id_set_rm', + 'node_id_set_rm', 'node_set_add', 'link_set_add'] } return ret - def __init__(self, link_set_rm=[], - node_set_rm=[], + def __init__(self, link_id_set_rm=[], + node_id_set_rm=[], node_set_add=[], link_set_add=[]): - self.link_set_rm = link_set_rm - self.node_set_rm = node_set_rm + self.link_id_set_rm = link_id_set_rm + self.node_id_set_rm = node_id_set_rm self.node_set_add = node_set_add self.link_set_add = link_set_add @@ -138,8 +138,8 @@ class Topo_Diff(object): """ ret = Topo_Diff() - # merge keys - this allows constructor argument omission (link_set_rm, - # node_set_rm, etc.) such as when constructing from POST JSON data + # merge keys - this allows constructor argument omission (link_id_set_rm, + # node_id_set_rm, etc.) such as when constructing from POST JSON data for k, _ in ret.__dict__.items(): v = json_dict.get(k) if None != v: -- cgit v1.3.1