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
d68c6145
Commit
d68c6145
authored
Dec 05, 2014
by
BrickXu
Committed by
xulei
Dec 05, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add validation for fields & exclude type.
parent
40421803
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
68 additions
and
0 deletions
+68
-0
rest_framework/serializers.py
+6
-0
tests/test_serializer_metaclass.py
+62
-0
No files found.
rest_framework/serializers.py
View file @
d68c6145
...
...
@@ -759,6 +759,12 @@ class ModelSerializer(Serializer):
depth
=
getattr
(
self
.
Meta
,
'depth'
,
0
)
extra_kwargs
=
getattr
(
self
.
Meta
,
'extra_kwargs'
,
{})
if
fields
and
not
isinstance
(
fields
,
(
list
,
tuple
)):
raise
TypeError
(
'`fields` must be a list or tuple'
)
if
exclude
and
not
isinstance
(
exclude
,
(
list
,
tuple
)):
raise
TypeError
(
'`exclude` must be a list or tuple'
)
assert
not
(
fields
and
exclude
),
"Cannot set both 'fields' and 'exclude'."
extra_kwargs
=
self
.
_include_additional_options
(
extra_kwargs
)
...
...
tests/test_serializer_metaclass.py
0 → 100644
View file @
d68c6145
from
django.test
import
TestCase
from
rest_framework
import
serializers
from
.models
import
BasicModel
class
TestSerializerMetaClass
(
TestCase
):
def
setUp
(
self
):
class
FieldsSerializer
(
serializers
.
ModelSerializer
):
text
=
serializers
.
CharField
()
class
Meta
:
model
=
BasicModel
fields
=
(
'text'
)
class
ExcludeSerializer
(
serializers
.
ModelSerializer
):
text
=
serializers
.
CharField
()
class
Meta
:
model
=
BasicModel
exclude
=
(
'text'
)
class
FieldsAndExcludeSerializer
(
serializers
.
ModelSerializer
):
text
=
serializers
.
CharField
()
class
Meta
:
model
=
BasicModel
fields
=
(
'text'
,)
exclude
=
(
'text'
,)
self
.
fields_serializer
=
FieldsSerializer
self
.
exclude_serializer
=
ExcludeSerializer
self
.
faeSerializer
=
FieldsAndExcludeSerializer
def
test_meta_class_fields
(
self
):
object
=
BasicModel
(
text
=
"Hello World."
)
serializer
=
self
.
fields_serializer
(
instance
=
object
)
with
self
.
assertRaises
(
TypeError
)
as
result
:
serializer
.
data
exception
=
result
.
exception
self
.
assertEqual
(
str
(
exception
),
"`fields` must be a list or tuple"
)
def
test_meta_class_exclude
(
self
):
object
=
BasicModel
(
text
=
"Hello World."
)
serializer
=
self
.
exclude_serializer
(
instance
=
object
)
with
self
.
assertRaises
(
TypeError
)
as
result
:
serializer
.
data
exception
=
result
.
exception
self
.
assertEqual
(
str
(
exception
),
"`exclude` must be a list or tuple"
)
def
test_meta_class_fields_and_exclude
(
self
):
object
=
BasicModel
(
text
=
"Hello World."
)
serializer
=
self
.
faeSerializer
(
instance
=
object
)
with
self
.
assertRaises
(
AssertionError
)
as
result
:
serializer
.
data
exception
=
result
.
exception
self
.
assertEqual
(
str
(
exception
),
"Cannot set both 'fields' and 'exclude'."
)
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