+ if role_filter is not None:
+ 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) %s" % role_filter.sql(api, "OR")
+ elif isinstance(role_filter, dict):
+ role_filter = Filter(Role.fields, role_filter)
+ sql += " AND (%s) %s" % role_filter.sql(api, "AND")
+ elif isinstance(role_filter, (int, long)):
+ role_filter = Filter(Role.fields, {'role_id': role_filter})
+ sql += " AND (%s) %s" % role_filter.sql(api, "AND")
+ elif isinstance(role_filter, StringTypes):
+ role_filter = Filter(Role.fields, {'name': role_filter})
+ sql += " AND (%s) %s" % role_filter.sql(api, "AND")
+ else:
+ raise PLCInvalidArgument, "Wrong role filter %r"%role_filter
+
+ self.selectall(sql)