blind 2to3

[plcapi.git] / PLC / BootStates.py

diff --git a/PLC/BootStates.py b/PLC/BootStates.py
index 416ca4d..d58bb93 100644 (file)
--- a/PLC/BootStates.py
+++ b/PLC/BootStates.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 BootState(Row):
     def validate_boot_state(self, name):
         # Make sure name is not blank
         if not len(name):
-            raise PLCInvalidArgument, "Boot state must be specified"
+            raise PLCInvalidArgument("Boot state must be specified")
 
-        # Make sure boot state does not alredy exist
+        # Make sure boot state does not already exist
         conflicts = BootStates(self.api, [name])
         if conflicts:
-            raise PLCInvalidArgument, "Boot state name already in use"
+            raise PLCInvalidArgument("Boot state name already in use")
 
         return name
 
@@ -49,6 +46,6 @@ class BootStates(Table):
               ", ".join(BootState.fields)
 
         if boot_states:
-            sql += " WHERE boot_state IN (%s)" % ", ".join(map(api.db.quote, boot_states))
+            sql += " WHERE boot_state IN (%s)" % ", ".join( [ api.db.quote (s) for s in boot_states ] )
 
         self.selectall(sql)