mirror of https://github.com/django/django.git
Remove text-mangling of default values.
This commit is contained in:
parent
c0b65150ff
commit
6b2d3f9206
|
@ -96,14 +96,6 @@ class ArrayField(Field):
|
||||||
value = [self.base_field.to_python(val) for val in vals]
|
value = [self.base_field.to_python(val) for val in vals]
|
||||||
return value
|
return value
|
||||||
|
|
||||||
def get_default(self):
|
|
||||||
"""Overridden from the default to prevent string-mangling."""
|
|
||||||
if self.has_default():
|
|
||||||
if callable(self.default):
|
|
||||||
return self.default()
|
|
||||||
return self.default
|
|
||||||
return None
|
|
||||||
|
|
||||||
def value_to_string(self, obj):
|
def value_to_string(self, obj):
|
||||||
values = []
|
values = []
|
||||||
vals = self._get_val_from_obj(obj)
|
vals = self._get_val_from_obj(obj)
|
||||||
|
|
|
@ -722,7 +722,7 @@ class Field(RegisterLookupMixin):
|
||||||
if self.has_default():
|
if self.has_default():
|
||||||
if callable(self.default):
|
if callable(self.default):
|
||||||
return self.default()
|
return self.default()
|
||||||
return force_text(self.default, strings_only=True)
|
return self.default
|
||||||
if (not self.empty_strings_allowed or (self.null and
|
if (not self.empty_strings_allowed or (self.null and
|
||||||
not connection.features.interprets_empty_strings_as_nulls)):
|
not connection.features.interprets_empty_strings_as_nulls)):
|
||||||
return None
|
return None
|
||||||
|
|
|
@ -857,6 +857,11 @@ Miscellaneous
|
||||||
:exc:`~django.test.client.RedirectCycleError` if it detects a loop or hits a
|
:exc:`~django.test.client.RedirectCycleError` if it detects a loop or hits a
|
||||||
maximum redirect limit (rather than passing silently).
|
maximum redirect limit (rather than passing silently).
|
||||||
|
|
||||||
|
* Translatable strings set as the ``default`` parameter of the field are cast
|
||||||
|
to concrete strings later, so the return type of ``Field.get_default()`` is
|
||||||
|
different in some cases. There is no change to default values which are the
|
||||||
|
result of a callable.
|
||||||
|
|
||||||
.. _deprecated-features-1.8:
|
.. _deprecated-features-1.8:
|
||||||
|
|
||||||
Features deprecated in 1.8
|
Features deprecated in 1.8
|
||||||
|
|
Loading…
Reference in New Issue