X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FIlinks.py;h=d99f13c2344e4442ef6a6450c571f2d18bd4a05a;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=b55df0c033d0404010c13148d0e57ae27aad75c5;hpb=286cdfc25f6ef8fd3e0ed59a175bcf801b14038a;p=plcapi.git diff --git a/PLC/Ilinks.py b/PLC/Ilinks.py index b55df0c..d99f13c 100644 --- a/PLC/Ilinks.py +++ b/PLC/Ilinks.py @@ -1,9 +1,6 @@ -# $Id# # # Thierry Parmentelat - INRIA # -# $Revision: 9423 $ -# from PLC.Faults import * from PLC.Parameter import Parameter from PLC.Filter import Filter @@ -40,12 +37,10 @@ class Ilinks(Table): ", ".join(self.columns) if ilink_filter is not None: - if isinstance(ilink_filter, (list, tuple, set)): + if isinstance(ilink_filter, (list, tuple, set, int, long)): ilink_filter = Filter(Ilink.fields, {'ilink_id': ilink_filter}) elif isinstance(ilink_filter, dict): ilink_filter = Filter(Ilink.fields, ilink_filter) - elif isinstance(ilink_filter, int): - ilink_filter = Filter(Ilink.fields, {'ilink_id': [ilink_filter]}) else: raise PLCInvalidArgument, "Wrong ilink filter %r"%ilink_filter sql += " AND (%s) %s" % ilink_filter.sql(api)