X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSlices.py;h=076d638a2dd30132a2eb6e4a316901c978169074;hb=6e915d8a9ac5474c20482751ab6d24e6ce13aec9;hp=606273f3e30201f29ffa21fc7bb69140da57fad1;hpb=647e5fff4e77d6139637a483b3d74cee597060de;p=plcapi.git diff --git a/PLC/Slices.py b/PLC/Slices.py index 606273f..076d638 100644 --- a/PLC/Slices.py +++ b/PLC/Slices.py @@ -1,4 +1,3 @@ -from types import StringTypes import time import re @@ -277,14 +276,14 @@ class Slices(Table): if isinstance(slice_filter, (list, tuple, set)): # Separate the list into integers and strings ints = [x for x in slice_filter if isinstance(x, int)] - strs = [x for x in slice_filter if isinstance(x, StringTypes)] + strs = [x for x in slice_filter if isinstance(x, str)] slice_filter = Filter(Slice.fields, {'slice_id': ints, 'name': strs}) sql += " AND (%s) %s" % slice_filter.sql(api, "OR") elif isinstance(slice_filter, dict): allowed_fields=dict(list(Slice.fields.items())+list(Slice.tags.items())) slice_filter = Filter(allowed_fields, slice_filter) sql += " AND (%s) %s" % slice_filter.sql(api, "AND") - elif isinstance (slice_filter, StringTypes): + elif isinstance (slice_filter, str): slice_filter = Filter(Slice.fields, {'name':slice_filter}) sql += " AND (%s) %s" % slice_filter.sql(api, "AND") elif isinstance (slice_filter, int):