X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSliceInstantiations.py;h=c0658d4c8d36891b4236f1021544a91d6726f25a;hb=da06561d0f5240a5409474e16824e4e015f31fac;hp=1087e32aff734f967aea19b7c1d03b29db9aee1d;hpb=f5cd72e35593c96b9996ab4e49674cccc7525c48;p=plcapi.git diff --git a/PLC/SliceInstantiations.py b/PLC/SliceInstantiations.py index 1087e32..c0658d4 100644 --- a/PLC/SliceInstantiations.py +++ b/PLC/SliceInstantiations.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 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. @@ -47,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)