X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FKeyTypes.py;h=920662b02332040ba541f0331a83b85b7c4c1e60;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=714502031ad702653864840b2ea5d9492d52b658;hpb=5dc283f954f5a2b82429aa0c5d5d8c5fc64eefac;p=plcapi.git

diff --git a/PLC/KeyTypes.py b/PLC/KeyTypes.py
index 7145020..920662b 100644
--- a/PLC/KeyTypes.py
+++ b/PLC/KeyTypes.py
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: KeyTypes.py,v 1.1 2006/10/10 22:09:31 mlhuang Exp $
+# $Id: KeyTypes.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 from PLC.Faults import *
@@ -25,11 +25,8 @@ class KeyType(Row):
         }
 
     def validate_key_type(self, name):
-	# Remove leading and trailing spaces
-	name = name.strip()
-
-	# Make sure name is not blank after we removed the spaces
-        if not name:
+	# 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
@@ -44,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)