# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Roles.py,v 1.6 2006/10/24 20:02:22 mlhuang Exp $
+# $Id: Roles.py 5574 2007-10-25 20:33:17Z thierry $
#
from types import StringTypes
", ".join(Role.fields)
if role_filter is not None:
- if isinstance(role_filter, list):
+ if isinstance(role_filter, (list, tuple, set)):
# Separate the list into integers and strings
ints = filter(lambda x: isinstance(x, (int, long)), role_filter)
strs = filter(lambda x: isinstance(x, StringTypes), role_filter)
role_filter = Filter(Role.fields, {'role_id': ints, 'name': strs})
- sql += " AND (%s)" % role_filter.sql(api, "OR")
+ sql += " AND (%s) %s" % role_filter.sql(api, "OR")
elif isinstance(role_filter, dict):
role_filter = Filter(Role.fields, role_filter)
- sql += " AND (%s)" % role_filter.sql(api, "AND")
+ sql += " AND (%s) %s" % role_filter.sql(api, "AND")
self.selectall(sql)