X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FNodeTags.py;h=adbc16863836ffa791144998b4274142fcf73351;hb=2d763c5797f31cc782ae63901b1dd3e48ba41173;hp=9e29192ac6d06844d01f91af2dda73a59e51f13c;hpb=00b458601d8f318b617b43d11cb4fdb93e89967c;p=plcapi.git diff --git a/PLC/NodeTags.py b/PLC/NodeTags.py index 9e29192..adbc168 100644 --- a/PLC/NodeTags.py +++ b/PLC/NodeTags.py @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ # # Thierry Parmentelat - INRIA # @@ -27,7 +25,6 @@ class NodeTag(Row): 'tagname': TagType.fields['tagname'], 'description': TagType.fields['description'], 'category': TagType.fields['category'], - 'min_role_id': TagType.fields['min_role_id'], } class NodeTags(Table): @@ -43,12 +40,12 @@ class NodeTags(Table): ", ".join(self.columns) if node_tag_filter is not None: - if isinstance(node_tag_filter, (list, tuple, set, int, long)): + if isinstance(node_tag_filter, (list, tuple, set, int)): node_tag_filter = Filter(NodeTag.fields, {'node_tag_id': node_tag_filter}) elif isinstance(node_tag_filter, dict): node_tag_filter = Filter(NodeTag.fields, node_tag_filter) else: - raise PLCInvalidArgument, "Wrong node tag filter %r"%node_tag_filter + raise PLCInvalidArgument("Wrong node tag filter %r"%node_tag_filter) sql += " AND (%s) %s" % node_tag_filter.sql(api)