X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSessions.py;h=511ed939eca1aaac0619179d48066af17dcf760b;hb=6e915d8a9ac5474c20482751ab6d24e6ce13aec9;hp=24ed8ad43104b85a12b11fa8e14322cb9355a052;hpb=647e5fff4e77d6139637a483b3d74cee597060de;p=plcapi.git diff --git a/PLC/Sessions.py b/PLC/Sessions.py index 24ed8ad..511ed93 100644 --- a/PLC/Sessions.py +++ b/PLC/Sessions.py @@ -1,4 +1,3 @@ -from types import StringTypes import random import base64 import time @@ -74,7 +73,7 @@ class Sessions(Table): if isinstance(session_filter, (list, tuple, set)): # Separate the list into integers and strings ints = [x for x in session_filter if isinstance(x, int)] - strs = [x for x in session_filter if isinstance(x, StringTypes)] + strs = [x for x in session_filter if isinstance(x, str)] session_filter = Filter(Session.fields, {'person_id': ints, 'session_id': strs}) sql += " AND (%s) %s" % session_filter.sql(api, "OR") elif isinstance(session_filter, dict): @@ -83,7 +82,7 @@ class Sessions(Table): elif isinstance(session_filter, int): session_filter = Filter(Session.fields, {'person_id': session_filter}) sql += " AND (%s) %s" % session_filter.sql(api, "AND") - elif isinstance(session_filter, StringTypes): + elif isinstance(session_filter, str): session_filter = Filter(Session.fields, {'session_id': session_filter}) sql += " AND (%s) %s" % session_filter.sql(api, "AND") else: