# Tony Mack <tmack@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id$
-# $URL$
-#
from PLC.Parameter import Parameter
from PLC.Table import Row, Table
sql += " AND enabled IS %s" % enabled
if message_filter is not None:
- if isinstance(message_filter, (list, tuple, set, int, long)):
+ if isinstance(message_filter, (list, tuple, set, int)):
message_filter = Filter(Message.fields, {'message_id': message_filter})
sql += " AND (%s) %s" % message_filter.sql(api, "OR")
elif isinstance(message_filter, dict):
message_filter = Filter(Message.fields, message_filter)
sql += " AND (%s) %s" % message_filter.sql(api, "AND")
else:
- raise PLCInvalidArgument, "Wrong message filter %r"%message_filter
+ raise PLCInvalidArgument("Wrong message filter %r"%message_filter)
self.selectall(sql)