From 409564091dee9633660370b1b2b01dbb82826de3 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Mon, 26 Aug 2024 11:27:29 -0400 Subject: [PATCH] Handle naive datetimes gracefully --- netbox/utilities/templatetags/builtins/filters.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/netbox/utilities/templatetags/builtins/filters.py b/netbox/utilities/templatetags/builtins/filters.py index 174c9a551..b1c8c524b 100644 --- a/netbox/utilities/templatetags/builtins/filters.py +++ b/netbox/utilities/templatetags/builtins/filters.py @@ -219,7 +219,8 @@ def isodate(value): text = value.isoformat() return mark_safe(f'{text}') elif type(value) is datetime.datetime: - text = localtime(value).date().isoformat() + local_value = localtime(value) if value.tzinfo else value + text = local_value.date().isoformat() return mark_safe(f'{text}') else: return '' @@ -230,7 +231,8 @@ def isotime(value, spec='seconds'): if type(value) is datetime.time: return value.isoformat(timespec=spec) if type(value) is datetime.datetime: - return localtime(value).time().isoformat(timespec=spec) + local_value = localtime(value) if value.tzinfo else value + return local_value.time().isoformat(timespec=spec) return ''