|
8 | 8 | import json
|
9 | 9 | import uuid
|
10 | 10 | from json.encoder import (FLOAT_REPR, INFINITY, _make_iterencode,
|
11 |
| - c_make_encoder, encode_basestring, |
12 |
| - encode_basestring_ascii) |
| 11 | + encode_basestring, encode_basestring_ascii) |
13 | 12 |
|
14 | 13 | from django.db.models.query import QuerySet
|
15 | 14 | from django.utils import six, timezone
|
@@ -76,18 +75,10 @@ def floatstr(o, allow_nan=self.allow_nan,
|
76 | 75 |
|
77 | 76 | return text
|
78 | 77 |
|
79 |
| - if (_one_shot and c_make_encoder is not None |
80 |
| - and self.indent is None): |
81 |
| - _iterencode = c_make_encoder( |
82 |
| - markers, self.default, _encoder, self.indent, |
83 |
| - self.key_separator, self.item_separator, self.sort_keys, |
84 |
| - self.skipkeys, self.allow_nan) |
85 |
| - else: |
86 |
| - _iterencode = _make_iterencode( |
87 |
| - markers, self.default, _encoder, self.indent, floatstr, |
88 |
| - self.key_separator, self.item_separator, self.sort_keys, |
89 |
| - self.skipkeys, _one_shot) |
90 |
| - return _iterencode(o, 0) |
| 78 | + return _make_iterencode(markers, self.default, _encoder, self.indent, |
| 79 | + floatstr, self.key_separator, |
| 80 | + self.item_separator, self.sort_keys, |
| 81 | + self.skipkeys, _one_shot)(o, 0) |
91 | 82 |
|
92 | 83 | def default(self, obj):
|
93 | 84 | # For Date Time string spec, see ECMA 262
|
|
0 commit comments