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
7cd39331
Commit
7cd39331
authored
Jan 06, 2016
by
Kevin Massey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #3804, avoiding update of Meta.extra_kwargs
Added unit test to cover.
parent
c46ed66d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
1 deletions
+32
-1
rest_framework/serializers.py
+1
-1
tests/test_model_serializer.py
+31
-0
No files found.
rest_framework/serializers.py
View file @
7cd39331
...
@@ -1212,7 +1212,7 @@ class ModelSerializer(Serializer):
...
@@ -1212,7 +1212,7 @@ class ModelSerializer(Serializer):
Return a dictionary mapping field names to a dictionary of
Return a dictionary mapping field names to a dictionary of
additional keyword arguments.
additional keyword arguments.
"""
"""
extra_kwargs
=
getattr
(
self
.
Meta
,
'extra_kwargs'
,
{}
)
extra_kwargs
=
copy
.
deepcopy
(
getattr
(
self
.
Meta
,
'extra_kwargs'
,
{})
)
read_only_fields
=
getattr
(
self
.
Meta
,
'read_only_fields'
,
None
)
read_only_fields
=
getattr
(
self
.
Meta
,
'read_only_fields'
,
None
)
if
read_only_fields
is
not
None
:
if
read_only_fields
is
not
None
:
...
...
tests/test_model_serializer.py
View file @
7cd39331
...
@@ -909,3 +909,34 @@ class TestDecimalFieldMappings(TestCase):
...
@@ -909,3 +909,34 @@ class TestDecimalFieldMappings(TestCase):
serializer
=
TestSerializer
()
serializer
=
TestSerializer
()
assert
serializer
.
fields
[
'decimal_field'
]
.
max_value
==
3
assert
serializer
.
fields
[
'decimal_field'
]
.
max_value
==
3
class
TestMetaInheritance
(
TestCase
):
def
test_extra_kwargs_not_altered
(
self
):
class
TestSerializer
(
serializers
.
ModelSerializer
):
non_model_field
=
serializers
.
CharField
()
class
Meta
:
model
=
OneFieldModel
read_only_fields
=
(
'char_field'
,
'non_model_field'
)
fields
=
read_only_fields
extra_kwargs
=
{}
class
ChildSerializer
(
TestSerializer
):
class
Meta
(
TestSerializer
.
Meta
):
read_only_fields
=
()
test_expected
=
dedent
(
"""
TestSerializer():
char_field = CharField(read_only=True)
non_model_field = CharField()
"""
)
child_expected
=
dedent
(
"""
ChildSerializer():
char_field = CharField(max_length=100)
non_model_field = CharField()
"""
)
self
.
assertEqual
(
unicode_repr
(
ChildSerializer
()),
child_expected
)
self
.
assertEqual
(
unicode_repr
(
TestSerializer
()),
test_expected
)
self
.
assertEqual
(
unicode_repr
(
ChildSerializer
()),
child_expected
)
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