encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-05 13:00:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

move allow_blank to Field

Browse Source
This commit is contained in:
Jannon Frank 2015-06-16 15:42:01 -07:00
parent 8935db1be9
commit 73b2aff0e0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/fields.py
View File

@ -170,7 +170,7 @@ class Field(object):
def __init__(self, read_only=False, write_only=False, def __init__(self, read_only=False, write_only=False,
required=None, default=empty, initial=empty, source=None, required=None, default=empty, initial=empty, source=None,
label=None, help_text=None, style=None, label=None, help_text=None, style=None,
error_messages=None, validators=None, allow_null=False): error_messages=None, validators=None, allow_null=False, allow_blank=False):
self._creation_counter = Field._creation_counter self._creation_counter = Field._creation_counter
Field._creation_counter += 1 Field._creation_counter += 1
@ -194,6 +194,7 @@ class Field(object):
self.help_text = help_text self.help_text = help_text
self.style = {} if style is None else style self.style = {} if style is None else style
self.allow_null = allow_null self.allow_null = allow_null
self.allow_blank = allow_blank
if self.default_empty_html is not empty: if self.default_empty_html is not empty:
if not required: if not required:
@ -564,7 +565,6 @@ class CharField(Field):
initial = '' initial = ''
def __init__(self, **kwargs): def __init__(self, **kwargs):
self.allow_blank = kwargs.pop('allow_blank', False)
self.trim_whitespace = kwargs.pop('trim_whitespace', True) self.trim_whitespace = kwargs.pop('trim_whitespace', True)
self.max_length = kwargs.pop('max_length', None) self.max_length = kwargs.pop('max_length', None)
self.min_length = kwargs.pop('min_length', None) self.min_length = kwargs.pop('min_length', None)
@ -1110,8 +1110,6 @@ class ChoiceField(Field):
(six.text_type(key), key) for key in self.choices.keys() (six.text_type(key), key) for key in self.choices.keys()
]) ])
self.allow_blank = kwargs.pop('allow_blank', False)
super(ChoiceField, self).__init__(**kwargs) super(ChoiceField, self).__init__(**kwargs)
def to_internal_value(self, data): def to_internal_value(self, data):