mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-08-02 03:20:12 +03:00
Drop 'BooleanField.allow_null' check
This commit is contained in:
parent
75d6ad3e20
commit
adad580e85
|
@ -10,7 +10,6 @@ import re
|
||||||
import uuid
|
import uuid
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
import django
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
from django.core.exceptions import ValidationError as DjangoValidationError
|
from django.core.exceptions import ValidationError as DjangoValidationError
|
||||||
|
@ -677,11 +676,6 @@ class BooleanField(Field):
|
||||||
}
|
}
|
||||||
NULL_VALUES = {'n', 'N', 'null', 'Null', 'NULL', '', None}
|
NULL_VALUES = {'n', 'N', 'null', 'Null', 'NULL', '', None}
|
||||||
|
|
||||||
def __init__(self, **kwargs):
|
|
||||||
if django.VERSION < (2, 1):
|
|
||||||
assert 'allow_null' not in kwargs, '`allow_null` is not a valid option. Use `NullBooleanField` instead.'
|
|
||||||
super(BooleanField, self).__init__(**kwargs)
|
|
||||||
|
|
||||||
def to_internal_value(self, data):
|
def to_internal_value(self, data):
|
||||||
try:
|
try:
|
||||||
if data in self.TRUE_VALUES:
|
if data in self.TRUE_VALUES:
|
||||||
|
|
|
@ -5,7 +5,6 @@ import unittest
|
||||||
import uuid
|
import uuid
|
||||||
from decimal import ROUND_DOWN, ROUND_UP, Decimal
|
from decimal import ROUND_DOWN, ROUND_UP, Decimal
|
||||||
|
|
||||||
import django
|
|
||||||
import pytest
|
import pytest
|
||||||
import pytz
|
import pytz
|
||||||
from django.core.exceptions import ValidationError as DjangoValidationError
|
from django.core.exceptions import ValidationError as DjangoValidationError
|
||||||
|
@ -683,7 +682,6 @@ class TestNullBooleanField(TestBooleanField):
|
||||||
field = serializers.NullBooleanField()
|
field = serializers.NullBooleanField()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.skipif(django.VERSION < (2, 1), reason='Django version < 2.1')
|
|
||||||
class TestNullableBooleanField(TestNullBooleanField):
|
class TestNullableBooleanField(TestNullBooleanField):
|
||||||
"""
|
"""
|
||||||
Valid and invalid values for `BooleanField` when `allow_null=True`.
|
Valid and invalid values for `BooleanField` when `allow_null=True`.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user