Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
87fdc73f
Commit
87fdc73f
authored
Oct 09, 2014
by
Tom Christie
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1920 from thedrow/topic/encoder-improvements
The JSON encoder now uses tuples instead of lists
parents
f7d43f53
79e91dff
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
rest_framework/utils/encoders.py
+2
-2
No files found.
rest_framework/utils/encoders.py
View file @
87fdc73f
...
@@ -45,7 +45,7 @@ class JSONEncoder(json.JSONEncoder):
...
@@ -45,7 +45,7 @@ class JSONEncoder(json.JSONEncoder):
# Serializers will coerce decimals to strings by default.
# Serializers will coerce decimals to strings by default.
return
float
(
obj
)
return
float
(
obj
)
elif
isinstance
(
obj
,
QuerySet
):
elif
isinstance
(
obj
,
QuerySet
):
return
list
(
obj
)
return
tuple
(
obj
)
elif
hasattr
(
obj
,
'tolist'
):
elif
hasattr
(
obj
,
'tolist'
):
# Numpy arrays and array scalars.
# Numpy arrays and array scalars.
return
obj
.
tolist
()
return
obj
.
tolist
()
...
@@ -55,7 +55,7 @@ class JSONEncoder(json.JSONEncoder):
...
@@ -55,7 +55,7 @@ class JSONEncoder(json.JSONEncoder):
except
:
except
:
pass
pass
elif
hasattr
(
obj
,
'__iter__'
):
elif
hasattr
(
obj
,
'__iter__'
):
return
[
item
for
item
in
obj
]
return
tuple
(
item
for
item
in
obj
)
return
super
(
JSONEncoder
,
self
)
.
default
(
obj
)
return
super
(
JSONEncoder
,
self
)
.
default
(
obj
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment