X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FEventObjects.py;fp=PLC%2FEventObjects.py;h=c2d53ee6ded7e772b3564f8b52e93a044f84178b;hb=00b458601d8f318b617b43d11cb4fdb93e89967c;hp=15b89f8f485fc2004e8a8cdce0be34251f437c64;hpb=396345c6da341555b1cfb3a2fc265687cd4a235b;p=plcapi.git

diff --git a/PLC/EventObjects.py b/PLC/EventObjects.py
index 15b89f8..c2d53ee 100644
--- a/PLC/EventObjects.py
+++ b/PLC/EventObjects.py
@@ -47,15 +47,12 @@ class EventObjects(Table):
             ", ".join(self.columns)
 
         if event_filter is not None:
-            if isinstance(event_filter, (list, tuple, set)):
+            if isinstance(event_filter, (list, tuple, set, int, long)):
                 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")
-            elif isinstance (event_filter, int):
-                event_filter = Filter(EventObject.fields, {'event_id':[event_filter]})
-                sql += " AND (%s) %s" % event_filter.sql(api, "AND")
             else:
                 raise PLCInvalidArgument, "Wrong event object filter %r"%event_filter