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
da1db34a
Commit
da1db34a
authored
Jan 19, 2015
by
Tom Christie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle UUID objects in JSONEncoder. Closes #2433.
parent
b3a0a279
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
rest_framework/utils/encoders.py
+3
-0
No files found.
rest_framework/utils/encoders.py
View file @
da1db34a
...
...
@@ -12,6 +12,7 @@ import datetime
import
decimal
import
types
import
json
import
uuid
class
JSONEncoder
(
json
.
JSONEncoder
):
...
...
@@ -45,6 +46,8 @@ class JSONEncoder(json.JSONEncoder):
elif
isinstance
(
obj
,
decimal
.
Decimal
):
# Serializers will coerce decimals to strings by default.
return
float
(
obj
)
elif
isinstance
(
obj
,
uuid
.
UUID
):
return
six
.
text_type
(
obj
)
elif
isinstance
(
obj
,
QuerySet
):
return
tuple
(
obj
)
elif
hasattr
(
obj
,
'tolist'
):
...
...
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