From cd40dcb06500424ef9016913a1a89db0deed8a1f Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 30 Oct 2014 16:53:12 +0000 Subject: Ensure json.dumps(separators=...) works on both 2.x and 3.x --- rest_framework/compat.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'rest_framework/compat.py') diff --git a/rest_framework/compat.py b/rest_framework/compat.py index 4ab23a4d..0201bd83 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -291,6 +291,15 @@ except ImportError: oauth2_constants = None provider_now = None +# `seperators` argument to `json.dumps()` differs between 2.x and 3.x +# See: http://bugs.python.org/issue22767 +if six.PY3: + SHORT_SEPARATORS = (',', ':') + LONG_SEPARATORS = (', ', ': ') +else: + SHORT_SEPARATORS = (b',', b':') + LONG_SEPARATORS = (b', ', b': ') + # Handle lazy strings across Py2/Py3 from django.utils.functional import Promise -- cgit v1.2.3