encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 09:36:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Permit mixed casing of string values for BooleanField validation (#8970)

Browse Source 
* be more permissive of mixed casing in validating strings for BooleanField values

* undo unnecessary change

* lint
This commit is contained in:
Nancy Eckenthal 2023-06-12 11:21:18 -04:00 committed by GitHub
parent 02d9bfc2dd
commit a180bde0fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
rest_framework/fields.py
View File

@ -664,22 +664,27 @@ 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):
@ -687,22 +692,28 @@ class BooleanField(Field):
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)

32
tests/test_fields.py
View File

@ -695,8 +695,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,
@ -709,8 +725,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,