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

Jump to bottom

Permit mixed casing of string values for BooleanField validation #8970

Merged
merged 3 commits into from
Jun 12, 2023
Merged

Permit mixed casing of string values for BooleanField validation #8970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad4ec1b
be more permissive of mixed casing in validating strings for BooleanF…
neckenth May 3, 2023
7704a24
undo unnecessary change
neckenth May 3, 2023
5a09412
lint
neckenth May 3, 2023
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
51 changes: 31 additions & 20 deletions rest_framework/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,45 +678,56 @@ class BooleanField(Field):
default_empty_html = False
initial = False
TRUE_VALUES = {
't', 'T',
'y', 'Y', 'yes', 'Yes', 'YES',
'true', 'True', 'TRUE',
'on', 'On', 'ON',
'1', 1,
True
't',
'y',
'yes',
'true',
'on',
'1',
1,
True,
}
FALSE_VALUES = {
'f', 'F',
'n', 'N', 'no', 'No', 'NO',
'false', 'False', 'FALSE',
'off', 'Off', 'OFF',
'0', 0, 0.0,
False
'f',
'n',
'no',
'false',
'off',
'0',
0,
0.0,
False,
}
NULL_VALUES = {'null', 'Null', 'NULL', '', None}
NULL_VALUES = {'null', '', None}

def __init__(self, **kwargs):
if kwargs.get('allow_null', False):
self.default_empty_html = None
self.initial = None
super().__init__(**kwargs)

@staticmethod
def _lower_if_str(value):
if isinstance(value, str):
return value.lower()
return value

def to_internal_value(self, data):
with contextlib.suppress(TypeError):
if data in self.TRUE_VALUES:
if self._lower_if_str(data) in self.TRUE_VALUES:
return True
elif data in self.FALSE_VALUES:
elif self._lower_if_str(data) in self.FALSE_VALUES:
return False
elif data in self.NULL_VALUES and self.allow_null:
elif self._lower_if_str(data) in self.NULL_VALUES and self.allow_null:
return None
self.fail('invalid', input=data)
self.fail("invalid", input=data)

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

Expand Down
32 changes: 32 additions & 0 deletions tests/test_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,8 +690,24 @@ class TestBooleanField(FieldValues):
Valid and invalid values for `BooleanField`.
"""
valid_inputs = {
'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,
Expand All @@ -704,8 +720,24 @@ class TestBooleanField(FieldValues):
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,
Expand Down
Loading