misc: don't encode json in local charset in python 3 (#36515)
This commit is contained in:
parent
5f8c243cd0
commit
d0b2407738
|
@ -499,6 +499,9 @@ class JSONEncoder(json.JSONEncoder):
|
|||
|
||||
def json_encode_helper(d, charset):
|
||||
'''Encode a JSON structure into local charset'''
|
||||
if six.PY3:
|
||||
# in python 3 we keep strings, no conversion to bytes
|
||||
return d
|
||||
if isinstance(d, unicode):
|
||||
return d.encode(charset)
|
||||
elif isinstance(d, list):
|
||||
|
|
Loading…
Reference in New Issue