X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSliceTags.py;h=2ba7a0187eccf3bf33ac53215d302a6d696a596f;hb=b5780972105512f088c235b1538e6cbbb1ee1ae4;hp=78273cab5fdf6f939609c3876a03016dece7e16a;hpb=0c28b6c095054293cc35c75a7a601486a4c249ff;p=plcapi.git diff --git a/PLC/SliceTags.py b/PLC/SliceTags.py index 78273ca..2ba7a01 100644 --- a/PLC/SliceTags.py +++ b/PLC/SliceTags.py @@ -1,5 +1,6 @@ -# $Id$ -# $URL$ +# +# Thierry Parmentelat - INRIA +# from PLC.Faults import * from PLC.Parameter import Parameter from PLC.Filter import Filter @@ -44,12 +45,12 @@ class SliceTags(Table): ", ".join(self.columns) if slice_tag_filter is not None: - if isinstance(slice_tag_filter, (list, tuple, set, int, long)): + if isinstance(slice_tag_filter, (list, tuple, set, int)): slice_tag_filter = Filter(SliceTag.fields, {'slice_tag_id': slice_tag_filter}) elif isinstance(slice_tag_filter, dict): slice_tag_filter = Filter(SliceTag.fields, slice_tag_filter) else: - raise PLCInvalidArgument, "Wrong slice tag filter %r"%slice_tag_filter + raise PLCInvalidArgument("Wrong slice tag filter %r"%slice_tag_filter) sql += " AND (%s) %s" % slice_tag_filter.sql(api) self.selectall(sql)