# Tony Mack <tmack@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id$
-# $URL$
-#
from PLC.Faults import *
from PLC.Parameter import Parameter
", ".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)