-from types import StringTypes
import random
import base64
import time
session.delete(commit)
# Generate 32 random bytes
- bytes = random.sample(range(0, 256), 32)
+ int8s = random.sample(range(0, 256), 32)
# Base64 encode their string representation
- self['session_id'] = base64.b64encode("".join(map(chr, bytes)))
+ self['session_id'] = base64.b64encode(bytes(int8s)).decode()
# Force insert
insert = True
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):
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: