X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FNodeGroups.py;h=abef32c5e81ede87d5205e39d57e706abe790877;hb=6e915d8a9ac5474c20482751ab6d24e6ce13aec9;hp=8f0a13eff08ea5e06cd00ae0b7faeb9c0fa92254;hpb=647e5fff4e77d6139637a483b3d74cee597060de;p=plcapi.git

diff --git a/PLC/NodeGroups.py b/PLC/NodeGroups.py
index 8f0a13e..abef32c 100644
--- a/PLC/NodeGroups.py
+++ b/PLC/NodeGroups.py
@@ -5,8 +5,6 @@
 # Copyright (C) 2006 The Trustees of Princeton University
 #
 
-from types import StringTypes
-
 from PLC.Faults import *
 from PLC.Parameter import Parameter, Mixed
 from PLC.Filter import Filter
@@ -92,7 +90,7 @@ class NodeGroups(Table):
             if isinstance(nodegroup_filter, (list, tuple, set)):
                 # Separate the list into integers and strings
                 ints = [x for x in nodegroup_filter if isinstance(x, int)]
-                strs = [x for x in nodegroup_filter if isinstance(x, StringTypes)]
+                strs = [x for x in nodegroup_filter if isinstance(x, str)]
                 nodegroup_filter = Filter(NodeGroup.fields, {'nodegroup_id': ints, 'groupname': strs})
                 sql += " AND (%s) %s" % nodegroup_filter.sql(api, "OR")
             elif isinstance(nodegroup_filter, dict):
@@ -101,7 +99,7 @@ class NodeGroups(Table):
             elif isinstance(nodegroup_filter, int):
                 nodegroup_filter = Filter(NodeGroup.fields, {'nodegroup_id': nodegroup_filter})
                 sql += " AND (%s) %s" % nodegroup_filter.sql(api, "AND")
-            elif isinstance(nodegroup_filter, StringTypes):
+            elif isinstance(nodegroup_filter, str):
                 nodegroup_filter = Filter(NodeGroup.fields, {'groupname': nodegroup_filter})
                 sql += " AND (%s) %s" % nodegroup_filter.sql(api, "AND")
             else: