X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FInitScripts.py;h=18a685fc704319739c3d6365e8a58968c7a9d561;hb=6e915d8a9ac5474c20482751ab6d24e6ce13aec9;hp=f7cb0b56b824fc80a5edee7b256ad0e788d6b042;hpb=647e5fff4e77d6139637a483b3d74cee597060de;p=plcapi.git

diff --git a/PLC/InitScripts.py b/PLC/InitScripts.py
index f7cb0b5..18a685f 100644
--- a/PLC/InitScripts.py
+++ b/PLC/InitScripts.py
@@ -5,7 +5,6 @@
 # Copyright (C) 2006 The Trustees of Princeton University
 #
 
-from types import StringTypes
 from PLC.Faults import *
 from PLC.Parameter import Parameter
 from PLC.Filter import Filter
@@ -55,7 +54,7 @@ class InitScripts(Table):
             if isinstance(initscript_filter, (list, tuple, set)):
                 # Separate the list into integers and strings
                 ints = [x for x in initscript_filter if isinstance(x, int)]
-                strs = [x for x in initscript_filter if isinstance(x, StringTypes)]
+                strs = [x for x in initscript_filter if isinstance(x, str)]
                 initscript_filter = Filter(InitScript.fields, {'initscript_id': ints, 'name': strs })
                 sql += " AND (%s) %s" % initscript_filter.sql(api, "OR")
             elif isinstance(initscript_filter, dict):
@@ -64,7 +63,7 @@ class InitScripts(Table):
             elif isinstance(initscript_filter, int):
                 initscript_filter = Filter(InitScript.fields, {'initscript_id': initscript_filter})
                 sql += " AND (%s) %s" % initscript_filter.sql(api, "AND")
-            elif isinstance(initscript_filter, StringTypes):
+            elif isinstance(initscript_filter, str):
                 initscript_filter = Filter(InitScript.fields, {'name': initscript_filter})
                 sql += " AND (%s) %s" % initscript_filter.sql(api, "AND")
             else: