Commit 87cd2d32 authored by Katia Saurfelt's avatar Katia Saurfelt
Browse files

chore: drop six dependency

parent df6b00b60de3
...@@ -15,7 +15,6 @@ web = "https://forge.extranet.logilab.fr/cubicweb/cubes/%s" % distname ...@@ -15,7 +15,6 @@ web = "https://forge.extranet.logilab.fr/cubicweb/cubes/%s" % distname
__depends__ = { __depends__ = {
"cubicweb": ">= 3.28.0, < 3.34.0", "cubicweb": ">= 3.28.0, < 3.34.0",
"six": ">= 1.4.0",
"cwtags": None, "cwtags": None,
"elasticsearch": ">=7.0.0,<8.0.0", "elasticsearch": ">=7.0.0,<8.0.0",
"elasticsearch-dsl": ">=7.0.0,<8.0.0", "elasticsearch-dsl": ">=7.0.0,<8.0.0",
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
"""elasticsearch search views""" """elasticsearch search views"""
from six import text_type as unicode
from elasticsearch.exceptions import NotFoundError from elasticsearch.exceptions import NotFoundError
from elasticsearch_dsl import FacetedSearch, TermsFacet, DateHistogramFacet from elasticsearch_dsl import FacetedSearch, TermsFacet, DateHistogramFacet
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
...@@ -158,7 +156,7 @@ class ElasticSearchView(StartupView): ...@@ -158,7 +156,7 @@ class ElasticSearchView(StartupView):
import json import json
self.w(u"<pre>") self.w(u"<pre>")
self.w(unicode(json.dumps(search._s.to_dict(), indent=2))) self.w(str(json.dumps(search._s.to_dict(), indent=2)))
self.w(u"</pre>") self.w(u"</pre>")
self.w(u"<br/>") self.w(u"<br/>")
try: try:
...@@ -167,7 +165,7 @@ class ElasticSearchView(StartupView): ...@@ -167,7 +165,7 @@ class ElasticSearchView(StartupView):
import json import json
self.w(u"<pre>") self.w(u"<pre>")
self.w(unicode(json.dumps(response.to_dict(), indent=2))) self.w(str(json.dumps(response.to_dict(), indent=2)))
self.w(u"</pre>") self.w(u"</pre>")
self.w(u"<br/>") self.w(u"<br/>")
return response return response
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment