Fix for Python 3

andyneff · andyneff · commit 8383e4021674 · 2017-02-21T19:41:28.000-05:00
diff --git a/rest_framework/utils/encoders.py b/rest_framework/utils/encoders.py
@@ -7,7 +7,7 @@
 import decimal
 import json
 import uuid
-from json.encoder import (FLOAT_REPR, INFINITY, _make_iterencode,
+from json.encoder import (INFINITY, _make_iterencode,
                           encode_basestring, encode_basestring_ascii)
 
 from django.db.models.query import QuerySet
@@ -17,6 +17,11 @@
 
 from rest_framework.compat import coreapi, total_seconds
 
+try:
+    from json.encoder import FLOAT_REPR
+except:
+    FLOAT_REPR = float.__repr__
+
 
 class JSONEncoder(json.JSONEncoder):
     """
@@ -47,12 +52,6 @@ def _encoder(o, _orig_encoder=_encoder,
                         o = o.decode(_encoding)
                     return _orig_encoder(o)
 
-        if self.encoding != 'utf-8':
-            def _encoder(o, _orig_encoder=_encoder, _encoding=self.encoding):
-                if isinstance(o, str):
-                    o = o.decode(_encoding)
-                return _orig_encoder(o)
-
         def floatstr(o, allow_nan=self.allow_nan,
                      _repr=FLOAT_REPR, _inf=INFINITY, _neginf=-INFINITY):
             # Check for specials.  Note that this type of test is processor
