From b2bd396880d5e77e0d00d209cf1b8e6b26836362 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Mon, 19 Jan 2015 18:12:43 +0200 Subject: Topo_Diff#to_json_dict: function reordering --- src/server/model/graph.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/server/model/graph.py b/src/server/model/graph.py index 1744ba46..95257f2e 100644 --- a/src/server/model/graph.py +++ b/src/server/model/graph.py @@ -123,13 +123,6 @@ class Topo_Diff(object): def default(self, obj): return obj.to_json_dict() - def to_json_dict(self): - 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_id_set_rm=[], node_id_set_rm=[], node_set_add=[], @@ -143,6 +136,13 @@ class Topo_Diff(object): def __str__(self): return __name__ + ': ' + ', '.join('%s: %s' % (k, v) for k, v in self.__dict__.items()) + def to_json_dict(self): + 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 check_validity(self, topo_diff_dict): """ Topo_Diff may represent invalid operations, eg. adding a link while -- cgit v1.3.1