From adad580e85df1e7bbdffbf50d22aa6d40f67eee1 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Thu, 13 Sep 2018 08:50:27 -0700 Subject: [PATCH] Drop 'BooleanField.allow_null' check --- rest_framework/fields.py | 6 ------ tests/test_fields.py | 2 -- 2 files changed, 8 deletions(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 8b45b9aa4..44956aa04 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -10,7 +10,6 @@ import re import uuid from collections import OrderedDict -import django from django.conf import settings from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ValidationError as DjangoValidationError @@ -677,11 +676,6 @@ class BooleanField(Field): } 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): try: if data in self.TRUE_VALUES: diff --git a/tests/test_fields.py b/tests/test_fields.py index 8458db604..1b8f596e2 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -5,7 +5,6 @@ import unittest import uuid from decimal import ROUND_DOWN, ROUND_UP, Decimal -import django import pytest import pytz from django.core.exceptions import ValidationError as DjangoValidationError @@ -683,7 +682,6 @@ class TestNullBooleanField(TestBooleanField): field = serializers.NullBooleanField() -@pytest.mark.skipif(django.VERSION < (2, 1), reason='Django version < 2.1') class TestNullableBooleanField(TestNullBooleanField): """ Valid and invalid values for `BooleanField` when `allow_null=True`.