Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Permit mixed casing of string values for BooleanField validation#8970

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.

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

Already on GitHub?Sign in to your account

Merged
Show file tree
Hide file tree
Changes fromall 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
51 changes: 31 additions & 20 deletionsrest_framework/fields.py
View file
Open in desktop
Original file line numberDiff line numberDiff 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:
ifself._lower_if_str(data) in self.TRUE_VALUES:
return True
elif data in self.FALSE_VALUES:
elifself._lower_if_str(data) in self.FALSE_VALUES:
return False
elif data in self.NULL_VALUES and self.allow_null:
elifself._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:
ifself._lower_if_str(value) in self.TRUE_VALUES:
return True
elif value in self.FALSE_VALUES:
elifself._lower_if_str(value) in self.FALSE_VALUES:
return False
if value in self.NULL_VALUES and self.allow_null:
ifself._lower_if_str(value) in self.NULL_VALUES and self.allow_null:
return None
return bool(value)

Expand Down
32 changes: 32 additions & 0 deletionstests/test_fields.py
View file
Open in desktop
Original file line numberDiff line numberDiff 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
[8]ページ先頭
©2009-2025 Movatter.jp