X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FKeys.py;h=ebabd190d555e7e02207700598d0e0db217ad603;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=53189668847abb3440aefc069640d1146f3ce5f1;hpb=f7ce7ce813d4c44502629820a3583f32a99a98f7;p=plcapi.git diff --git a/PLC/Keys.py b/PLC/Keys.py index 5318966..ebabd19 100644 --- a/PLC/Keys.py +++ b/PLC/Keys.py @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ import re from PLC.Faults import * @@ -110,10 +108,12 @@ class Keys(Table): ", ".join(self.columns) if key_filter is not None: - if isinstance(key_filter, (list, tuple, set)): + if isinstance(key_filter, (list, tuple, set, int, long)): key_filter = Filter(Key.fields, {'key_id': key_filter}) elif isinstance(key_filter, dict): key_filter = Filter(Key.fields, key_filter) + else: + raise PLCInvalidArgument, "Wrong key filter %r"%key_filter sql += " AND (%s) %s" % key_filter.sql(api) self.selectall(sql)