actions/opensearch-pyd
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for 7.4 encoding change

Browse Source
This commit is contained in:
Chris B
2019-11-06 17:02:02 +01:00
committed by Honza Král
parent 1438d66045
commit f1df7ae604
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/client/utils.py
+2 -2
View File
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
import weakref import weakref
from datetime import date, datetime from datetime import date, datetime
from functools import wraps from functools import wraps
from ..compat import string_types, quote_plus, PY2 from ..compat import string_types, quote, PY2
# parts of URL to be omitted # parts of URL to be omitted
SKIP_IN_PATH = (None, "", b"", [], ()) SKIP_IN_PATH = (None, "", b"", [], ())
@@ -49,7 +49,7 @@ def _make_path(*parts):
# TODO: maybe only allow some parts to be lists/tuples ? # TODO: maybe only allow some parts to be lists/tuples ?
return "/" + "/".join( return "/" + "/".join(
# preserve ',' and '*' in url for nicer URLs in logs # preserve ',' and '*' in url for nicer URLs in logs
quote_plus(_escape(p), b",*") quote(_escape(p), b",*")
for p in parts for p in parts
if p not in SKIP_IN_PATH if p not in SKIP_IN_PATH
) )
elasticsearch/compat.py
+1 -1
View File
@@ -10,7 +10,7 @@ if PY2:
from Queue import Queue from Queue import Queue
else: else:
string_types = str, bytes string_types = str, bytes
from urllib.parse import quote_plus, urlencode, urlparse, unquote from urllib.parse import quote, quote_plus, urlencode, urlparse, unquote
map = map map = map
from queue import Queue from queue import Queue