the PLCAPI class requires __construct as well in order to move to php8

[plcapi.git] / PLC / SliceInstantiations.py

diff --git a/PLC/SliceInstantiations.py b/PLC/SliceInstantiations.py
index f03b119..fd803a9 100644 (file)
--- a/PLC/SliceInstantiations.py
+++ b/PLC/SliceInstantiations.py
@@ -4,9 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-# $URL$
-#
 
 from PLC.Faults import *
 from PLC.Parameter import Parameter
@@ -28,12 +25,12 @@ class SliceInstantiation(Row):
     def validate_instantiation(self, instantiation):
         # Make sure name is not blank
         if not len(instantiation):
-            raise PLCInvalidArgument, "Slice instantiation state name must be specified"
+            raise PLCInvalidArgument("Slice instantiation state name must be specified")
 
         # Make sure slice instantiation does not alredy exist
         conflicts = SliceInstantiations(self.api, [instantiation])
         if conflicts:
-            raise PLCInvalidArgument, "Slice instantiation state name already in use"
+            raise PLCInvalidArgument("Slice instantiation state name already in use")
 
         return instantiation
 
@@ -49,6 +46,6 @@ class SliceInstantiations(Table):
               ", ".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)