Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ListField should enforce that input is a list #3513

Merged
merged 6 commits into from
Nov 18, 2015
Merged

ListField should enforce that input is a list #3513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f808f08
Require that data is a list.
pattisdr Oct 16, 2015
b931615
Add tuple and Set to allowed ListField data types
pattisdr Oct 16, 2015
dac1637
Use set instead of Set
pattisdr Oct 16, 2015
8fa7c5c
Exclude collections.Mapping from allowable data types in ListField
pattisdr Oct 20, 2015
5fdc4f2
Add tests to ensure ListField does not except dictionary as input.
pattisdr Nov 13, 2015
3ddbf92
Remove unicode from exception value.
pattisdr Nov 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rest_framework/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,7 +1461,7 @@ def to_internal_value(self, data):
"""
if html.is_html_input(data):
data = html.parse_html_list(data)
if isinstance(data, type('')) or not hasattr(data, '__iter__'):
if isinstance(data, type('')) or isinstance(data, collections.Mapping) or not hasattr(data, '__iter__'):
self.fail('not_a_list', input_type=type(data).__name__)
if not self.allow_empty and len(data) == 0:
self.fail('empty')
Expand Down
11 changes: 10 additions & 1 deletion tests/test_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,8 @@ class TestListField(FieldValues):
]
invalid_inputs = [
('not a list', ['Expected a list of items but got type "str".']),
([1, 2, 'error'], ['A valid integer is required.'])
([1, 2, 'error'], ['A valid integer is required.']),
({'one': 'two'}, ['Expected a list of items but got type "dict".'])
]
outputs = [
([1, 2, 3], [1, 2, 3]),
Expand All @@ -1454,6 +1455,14 @@ def test_no_source_on_child(self):
"Remove `source=` from the field declaration."
)

def test_collection_types_are_invalid_input(self):
field = serializers.ListField(child=serializers.CharField())
input_value = ({'one': 'two'})

with pytest.raises(serializers.ValidationError) as exc_info:
field.to_internal_value(input_value)
assert exc_info.value.detail == ['Expected a list of items but got type "dict".']


class TestEmptyListField(FieldValues):
"""
Expand Down