X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FKeyTypes.py;h=920662b02332040ba541f0331a83b85b7c4c1e60;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=6ac7111bdd9dfb34c54cfabf2a1a6d2110066b75;hpb=ed7fa1ebf97ec2f88f18f8fa538e46c6ae9525c4;p=plcapi.git diff --git a/PLC/KeyTypes.py b/PLC/KeyTypes.py index 6ac7111..920662b 100644 --- a/PLC/KeyTypes.py +++ b/PLC/KeyTypes.py @@ -4,7 +4,7 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: KeyTypes.py,v 1.2 2006/10/20 17:44:57 mlhuang Exp $ +# $Id: KeyTypes.py 5574 2007-10-25 20:33:17Z thierry $ # from PLC.Faults import * @@ -41,15 +41,13 @@ class KeyTypes(Table): Representation of the key_types table in the database. """ - def __init__(self, api, names = None): + def __init__(self, api, key_types = None): + Table.__init__(self, api, KeyType) + sql = "SELECT %s FROM key_types" % \ ", ".join(KeyType.fields) - if names: - # Separate the list into integers and strings - sql += " WHERE key_type IN (%s)" % ", ".join(api.db.quote(names)) - - rows = api.db.selectall(sql) + if key_types: + sql += " WHERE key_type IN (%s)" % ", ".join(map(api.db.quote, key_types)) - for row in rows: - self[row['key_type']] = KeyType(api, row) + self.selectall(sql)