X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FKeyTypes.py;h=df15643b8e83daeb64d088d8982740a9e9582d45;hb=refs%2Fheads%2Fremove-xmlrpc;hp=e491b45f042177f59052fc4f180fa4d26830a05c;hpb=f5cd72e35593c96b9996ab4e49674cccc7525c48;p=plcapi.git diff --git a/PLC/KeyTypes.py b/PLC/KeyTypes.py index e491b45..df15643 100644 --- a/PLC/KeyTypes.py +++ b/PLC/KeyTypes.py @@ -4,9 +4,6 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id$ -# $URL$ -# from PLC.Faults import * from PLC.Parameter import Parameter @@ -26,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. @@ -47,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)