Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions rest_framework/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -708,12 +708,13 @@ def to_internal_value(self, data):
self.fail("invalid", input=data)

def to_representation(self, value):
if self._lower_if_str(value) in self.TRUE_VALUES:
return True
elif self._lower_if_str(value) in self.FALSE_VALUES:
return False
if self._lower_if_str(value) in self.NULL_VALUES and self.allow_null:
return None
with contextlib.suppress(TypeError):
if self._lower_if_str(value) in self.TRUE_VALUES:
return True
elif self._lower_if_str(value) in self.FALSE_VALUES:
return False
if self._lower_if_str(value) in self.NULL_VALUES and self.allow_null:
return None
return bool(value)


Expand Down
59 changes: 32 additions & 27 deletions tests/test_fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -774,33 +774,38 @@ class TestBooleanField(FieldValues):
'foo': ['Must be a valid boolean.'],
None: ['This field may not be null.']
}
outputs = {
'True': True,
'TRUE': True,
'tRuE': True,
't': True,
'T': True,
'true': True,
'on': True,
'ON': True,
'oN': True,
'False': False,
'FALSE': False,
'fALse': False,
'f': False,
'F': False,
'false': False,
'off': False,
'OFF': False,
'oFf': False,
'1': True,
'0': False,
1: True,
0: False,
True: True,
False: False,
'other': True
}
outputs = [
('True', True),
('TRUE', True),
('tRuE', True),
('t', True),
('T', True),
('true', True),
('on', True),
('ON', True),
('oN', True),
('False', False),
('FALSE', False),
('fALse', False),
('f', False),
('F', False),
('false', False),
('off', False),
('OFF', False),
('oFf', False),
('1', True),
('0', False),
(1, True),
(0, False),
(True, True),
(False, False),
('other', True),
([], False),
({}, False),
(set(), False),
([1], True),
({'example': 'value'}, True),
]
field = serializers.BooleanField()

def test_disallow_unhashable_collection_types(self):
Expand Down
Loading