X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FEventObjects.py;h=6dc45731713deb1674e17920208391209ed9f736;hb=3b44c0228c26dc43d985185afc225caa5f48c1fb;hp=5f046bf2299bf2ee1e643d014ce66f91019dfed5;hpb=997c5bbe5b0576ae8c9c8d52a80dab1dcecf615a;p=plcapi.git diff --git a/PLC/EventObjects.py b/PLC/EventObjects.py index 5f046bf..6dc4573 100644 --- a/PLC/EventObjects.py +++ b/PLC/EventObjects.py @@ -44,13 +44,13 @@ class EventObjects(Table): ", ".join(self.columns) if event_filter is not None: - if isinstance(event_filter, (list, tuple, set, int, long)): + if isinstance(event_filter, (list, tuple, set, int)): event_filter = Filter(EventObject.fields, {'event_id': event_filter}) sql += " AND (%s) %s" % event_filter.sql(api, "OR") elif isinstance(event_filter, dict): event_filter = Filter(EventObject.fields, event_filter) sql += " AND (%s) %s" % event_filter.sql(api, "AND") else: - raise PLCInvalidArgument, "Wrong event object filter %r"%event_filter + raise PLCInvalidArgument("Wrong event object filter %r"%event_filter) self.selectall(sql)