From db5d5f63032b9efdb2e6953987ef1e10624f4c5e Mon Sep 17 00:00:00 2001 From: LV-426 Date: Tue, 6 Jan 2015 15:02:07 +0200 Subject: inline __type_check_link() --- src/server/neo4j_util.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/server/neo4j_util.py b/src/server/neo4j_util.py index 568be104..5c185ceb 100644 --- a/src/server/neo4j_util.py +++ b/src/server/neo4j_util.py @@ -245,10 +245,9 @@ def gen_query_create_from_link_map(link_map, input_to_DB_property_map=lambda _: ] for link in l_set: - __type_check_link(link) - - src_id = link['__src_id'] - dst_id = link['__dst_id'] + assert link.has_key('__src_id') + assert link.has_key('__dst_id') + assert link.has_key('id'), 'link create query: link id attribute not set' # TODO: use object based link representation prop_dict = link.copy() @@ -286,10 +285,6 @@ def meta_attr_list_to_meta_attr_map(e_set, meta_attr='__label_set'): return ret -def __type_check_link(link): - assert link.has_key('__src_id') - assert link.has_key('__dst_id') - def __type_check_link_or_node_map(x_map): for k, v in x_map.iteritems(): # do some type sanity checking assert isinstance(k, six.string_types) -- cgit v1.3.1