From b85eb8914c305a0339644e1b6c8a128dc1cf3c99 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 15 Oct 2014 17:29:20 +0200 Subject: [PATCH] [backport] Auto coerce bytes to string on own json module.a Only for tests. --- taiga/base/utils/json.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/taiga/base/utils/json.py b/taiga/base/utils/json.py index dcb818a3..bb8dde78 100644 --- a/taiga/base/utils/json.py +++ b/taiga/base/utils/json.py @@ -16,13 +16,15 @@ import json from rest_framework.utils import encoders +from django.utils.encoding import force_text def dumps(data, ensure_ascii=True, encoder_class=encoders.JSONEncoder): return json.dumps(data, cls=encoder_class, indent=None, ensure_ascii=ensure_ascii) - def loads(data): + if isinstance(data, bytes): + data = force_text(data) return json.loads(data) # Some backward compatibility that should