X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FKeyTypes.py;h=df15643b8e83daeb64d088d8982740a9e9582d45;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=34df0196e4cbaba71ecf95b332f9cdf13104a4ba;hpb=a74854dd38cb742b8fdc0d0cda7fff738a95312c;p=plcapi.git diff --git a/PLC/KeyTypes.py b/PLC/KeyTypes.py index 34df019..df15643 100644 --- a/PLC/KeyTypes.py +++ b/PLC/KeyTypes.py @@ -4,8 +4,6 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id$ -# from PLC.Faults import * from PLC.Parameter import Parameter @@ -25,17 +23,17 @@ class KeyType(Row): } def validate_key_type(self, name): - # Make sure name is not blank + # Make sure name is not blank if not len(name): raise PLCInvalidArgument, "Key type must be specified" - - # Make sure key type does not alredy exist - conflicts = KeyTypes(self.api, [name]) + + # Make sure key type does not alredy exist + conflicts = KeyTypes(self.api, [name]) if conflicts: raise PLCInvalidArgument, "Key type name already in use" - return name - + return name + class KeyTypes(Table): """ Representation of the key_types table in the database. @@ -46,8 +44,8 @@ class KeyTypes(Table): sql = "SELECT %s FROM key_types" % \ ", ".join(KeyType.fields) - + if key_types: - sql += " WHERE key_type IN (%s)" % ", ".join(map(api.db.quote, key_types)) + sql += " WHERE key_type IN (%s)" % ", ".join( [ api.db.quote (t) for t in key_types ] ) self.selectall(sql)