====

[plcapi.git] / PLC / SliceInstantiations.py

diff --git a/PLC/SliceInstantiations.py b/PLC/SliceInstantiations.py
index 4996a1e..c0658d4 100644 (file)
--- a/PLC/SliceInstantiations.py
+++ b/PLC/SliceInstantiations.py
@@ -4,8 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
 
 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)