X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSliceInstantiations.py;h=c0658d4c8d36891b4236f1021544a91d6726f25a;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=843b3270ab8f2a82141e83bbc99c57d9534738d1;hpb=152398ef376857eb764285fcc1c8280ad3b244e6;p=plcapi.git diff --git a/PLC/SliceInstantiations.py b/PLC/SliceInstantiations.py index 843b327..c0658d4 100644 --- a/PLC/SliceInstantiations.py +++ b/PLC/SliceInstantiations.py @@ -4,8 +4,6 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: SliceInstantiations.py,v 1.2 2006/10/03 19:27:28 mlhuang Exp $ -# from PLC.Faults import * from PLC.Parameter import Parameter @@ -25,17 +23,17 @@ class SliceInstantiation(Row): } def validate_instantiation(self, instantiation): - # Make sure name is not blank + # Make sure name is not blank if not len(instantiation): raise PLCInvalidArgument, "Slice instantiation state name must be specified" - - # Make sure slice instantiation does not alredy exist - conflicts = SliceInstantiations(self.api, [instantiation]) + + # Make sure slice instantiation does not alredy exist + conflicts = SliceInstantiations(self.api, [instantiation]) if conflicts: raise PLCInvalidArgument, "Slice instantiation state name already in use" - return instantiation - + return instantiation + class SliceInstantiations(Table): """ Representation of the slice_instantiations table in the database. @@ -46,8 +44,8 @@ class SliceInstantiations(Table): sql = "SELECT %s FROM slice_instantiations" % \ ", ".join(SliceInstantiation.fields) - + if instantiations: - sql += " WHERE instantiation IN (%s)" % ", ".join(map(api.db.quote, instantiations)) + sql += " WHERE instantiation IN (%s)" % ", ".join( [ api.db.quote (i) for i in instantiations ] ) self.selectall(sql)