p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Made BoundField.initial use cached_property. 

Follow up to fab46ce6f5.
This commit is contained in:
Jon Dufresne 2016-08-12 12:43:24 -07:00 committed by GitHub
parent fab46ce6f5
commit 6b842c5998
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
django/forms/boundfield.py
View File

@ -16,9 +16,6 @@ from django.utils.translation import ugettext_lazy as _
__all__ = ('BoundField',) __all__ = ('BoundField',)
UNSET = object()
@html_safe @html_safe
@python_2_unicode_compatible @python_2_unicode_compatible
class BoundField(object): class BoundField(object):
@ -35,7 +32,6 @@ class BoundField(object):
else: else:
self.label = self.field.label self.label = self.field.label
self.help_text = field.help_text or '' self.help_text = field.help_text or ''
self._initial_value = UNSET
def __str__(self): def __str__(self):
"""Renders this field as an HTML widget.""" """Renders this field as an HTML widget."""
@ -220,20 +216,16 @@ class BoundField(object):
id_ = widget.attrs.get('id') or self.auto_id id_ = widget.attrs.get('id') or self.auto_id
return widget.id_for_label(id_) return widget.id_for_label(id_)
@property @cached_property
def initial(self): def initial(self):
data = self.form.initial.get(self.name, self.field.initial) data = self.form.initial.get(self.name, self.field.initial)
if callable(data): if callable(data):
if self._initial_value is not UNSET: data = data()
data = self._initial_value # If this is an auto-generated default date, nix the microseconds
else: # for standardized handling. See #22502.
data = data() if (isinstance(data, (datetime.datetime, datetime.time)) and
# If this is an auto-generated default date, nix the not self.field.widget.supports_microseconds):
# microseconds for standardized handling. See #22502. data = data.replace(microsecond=0)
if (isinstance(data, (datetime.datetime, datetime.time)) and
not self.field.widget.supports_microseconds):
data = data.replace(microsecond=0)
self._initial_value = data
return data return data
def build_widget_attrs(self, attrs, widget=None): def build_widget_attrs(self, attrs, widget=None):