git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
====
[plcapi.git]
/
PLC
/
KeyTypes.py
diff --git
a/PLC/KeyTypes.py
b/PLC/KeyTypes.py
index
34df019
..
df15643
100644
(file)
--- a/
PLC/KeyTypes.py
+++ b/
PLC/KeyTypes.py
@@
-4,8
+4,6
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id$
-#
from PLC.Faults import *
from PLC.Parameter import Parameter
from PLC.Faults import *
from PLC.Parameter import Parameter
@@
-25,17
+23,17
@@
class KeyType(Row):
}
def validate_key_type(self, name):
}
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"
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"
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.
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)
sql = "SELECT %s FROM key_types" % \
", ".join(KeyType.fields)
-
+
if key_types:
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)
self.selectall(sql)