encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-05 04:50:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Forgot to remove _one_shot C path

Browse Source
This commit is contained in:
Andy Neff 2017-02-21 19:25:28 -05:00
parent da63f5e82d
commit fb0f9150b3
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rest_framework/utils/encoders.py
View File

@ -8,8 +8,7 @@ import decimal
import json
import uuid
from json.encoder import (FLOAT_REPR, INFINITY, _make_iterencode,
c_make_encoder, encode_basestring,
encode_basestring_ascii)
encode_basestring, encode_basestring_ascii)
from django.db.models.query import QuerySet
from django.utils import six, timezone
@ -76,18 +75,10 @@ class JSONEncoder(json.JSONEncoder):
return text
if (_one_shot and c_make_encoder is not None
and self.indent is None):
_iterencode = c_make_encoder(
markers, self.default, _encoder, self.indent,
self.key_separator, self.item_separator, self.sort_keys,
self.skipkeys, self.allow_nan)
else:
_iterencode = _make_iterencode(
markers, self.default, _encoder, self.indent, floatstr,
self.key_separator, self.item_separator, self.sort_keys,
self.skipkeys, _one_shot)
return _iterencode(o, 0)
return _make_iterencode(markers, self.default, _encoder, self.indent,
floatstr, self.key_separator,
self.item_separator, self.sort_keys,
self.skipkeys, _one_shot)(o, 0)
def default(self, obj):
# For Date Time string spec, see ECMA 262