#
# Thierry Parmentelat - INRIA
#
-# $Revision: 9423 $
-#
from PLC.Faults import *
from PLC.Parameter import Parameter
from PLC.Filter import Filter
", ".join(self.columns)
if ilink_filter is not None:
- if isinstance(ilink_filter, (list, tuple, set)):
+ if isinstance(ilink_filter, (list, tuple, set, int)):
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
+ raise PLCInvalidArgument("Wrong ilink filter %r"%ilink_filter)
sql += " AND (%s) %s" % ilink_filter.sql(api)