Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Version 3.3.0b4

Unreleased

- :meth:`~fields.DateTimeField._value` and
:meth:`~fields.DateTimeLocalField._value` render plain string ``data`` /
``obj`` values instead of raising ``AttributeError``.

- :class:`~datalist.DataList` ``choices`` accepts the shorthand
``{value: label}`` dict syntax. :issue:`886`
- ``choices`` callables on fields nested in a :class:`~fields.FieldList` are
Expand Down
11 changes: 9 additions & 2 deletions src/wtforms/fields/datetime.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,13 @@ def __init__(
def _value(self):
if self.raw_data:
return " ".join(self.raw_data)
if not self.data:
return ""
format = self.format[0]
return self.data and self.data.strftime(format) or ""
# data=/obj may supply a plain string; still render for the widget.
if not hasattr(self.data, "strftime"):
return str(self.data)
return self.data.strftime(format)

def process_formdata(self, valuelist):
if not valuelist:
Expand Down Expand Up @@ -279,8 +284,10 @@ def _value(self):
return ""

value = self.data
if not hasattr(value, "strftime"):
return str(value)
tz = self._resolve_tz()
if tz is not None and value.tzinfo is not None:
if tz is not None and getattr(value, "tzinfo", None) is not None:
value = value.astimezone(tz).replace(tzinfo=None)

return value.strftime(self.format[0])
Expand Down
11 changes: 11 additions & 0 deletions tests/fields/test_date.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,14 @@ class G(Form):
form = G(DummyPostData(a=["bogus"]))
assert not form.validate()
assert form.a.errors == ["Enter a date as YYYY-MM-DD."]


def test_initial_string_data_renders():
form = F(data={"a": "2020-01-02"})
assert form.a.data == "2020-01-02"
assert form.a._value() == "2020-01-02"


def test_initial_non_date_obj_attribute_renders():
form = F(obj=type("O", (), {"a": "not-a-date"})())
assert form.a._value() == "not-a-date"
8 changes: 8 additions & 0 deletions tests/fields/test_datetimelocal.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,11 @@ def test_tz_naive_data_rendered_unchanged():
F = make_form(a=DateTimeLocalField(tz=paris))
form = F(a=datetime(2026, 5, 6, 16, 0))
assert form.a._value() == "2026-05-06 16:00:00"


def test_initial_string_data_renders():
class G(Form):
a = DateTimeLocalField()

form = G(data={"a": "2020-01-02T03:04"})
assert form.a._value() == "2020-01-02T03:04"
Loading