--- a/cubicweb/server/sources/rql2sql.py Fri Apr 05 17:21:14 2019 +0200
+++ b/cubicweb/server/sources/rql2sql.py Fri Apr 05 17:58:19 2019 +0200
@@ -49,9 +49,6 @@
import threading
-from six import PY2, text_type
-from six.moves import range
-
from logilab.database import FunctionDescr, SQL_FUNCTIONS_REGISTRY
from rql import BadRQLQuery, CoercionError
@@ -1517,8 +1514,6 @@
return self.keyword_map[value]()
if constant.type == 'Substitute':
_id = value
- if PY2 and isinstance(_id, text_type):
- _id = _id.encode()
else:
_id = str(id(constant)).replace('-', '', 1)
self._query_attrs[_id] = value