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

diff --git a/PLC/Events.py b/PLC/Events.py
index b8ad6e8..e0f0d31 100644
--- a/PLC/Events.py
+++ b/PLC/Events.py
@@ -70,9 +70,11 @@ class Events(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(Event.fields, {'event_id': event_filter})
             elif isinstance(event_filter, dict):
                 event_filter = Filter(Event.fields, event_filter)
+            else:
+                raise PLCInvalidArgument, "Wrong event object filter %r"%event_filter
             sql += " AND (%s) %s" % event_filter.sql(api)
         self.selectall(sql)