Skip to content

refactor: replace if/elif chain with match/case in datetime formatting #7013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcosppca wants to merge 4 commits into
base: main
Choose a base branch
from
Open

refactor: replace if/elif chain with match/case in datetime formatting #7013

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abeb97b
refactor: replace if/elif with match/case
marcosppca Nov 6, 2025
8145333
refactor: replace if/elif with match/case
marcosppca Nov 6, 2025
a8d57e2
style: remove extra blank line for consistency
marcosppca Nov 7, 2025
aa6c5cd
fix: adjust datetimeformat logic for CI validation - if for match
marcosppca Nov 7, 2025
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
67 changes: 38 additions & 29 deletions kitsune/sumo/templatetags/jinja_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,35 +278,44 @@ def datetimeformat(context, value, format="shortdatetime", use_naturaltime=False
if use_naturaltime and (django_now().astimezone(convert_tzinfo) - convert_value).days < 30:
return naturaltime(convert_value)

if format == "shortdatetime" or format == "shortdate":
# Check if the date is today
today = datetime.datetime.now(tz=convert_tzinfo).toordinal()
kwargs = {"format": "short", "tzinfo": convert_tzinfo, "locale": locale}
if convert_value.toordinal() == today:
formatted = _lazy("Today at %s") % format_time(convert_value, **kwargs)
elif format == "shortdatetime":
formatted = format_datetime(convert_value, **kwargs)
else:
del kwargs["tzinfo"]
formatted = format_date(convert_value, **kwargs)
elif format == "longdatetime":
formatted = format_datetime(
convert_value, format="long", tzinfo=convert_tzinfo, locale=locale
)
elif format == "date":
formatted = format_date(convert_value, locale=locale)
elif format == "time":
formatted = format_time(convert_value, tzinfo=convert_tzinfo, locale=locale)
elif format == "datetime":
formatted = format_datetime(convert_value, tzinfo=convert_tzinfo, locale=locale)
elif format == "year":
formatted = format_datetime(
convert_value, format="yyyy", tzinfo=convert_tzinfo, locale=locale
)
else:
# Unknown format
raise DateTimeFormatError

match format:
case "shortdatetime" | "shortdate":
today_date = datetime.datetime.now(tz=convert_tzinfo).date()

def _as_date_in_tz(v, tz):
import datetime as _dt
if isinstance(v, _dt.date) and not isinstance(v, _dt.datetime):
return v
if tz is None:
return v.date()
if v.tzinfo is None:
return v.replace(tzinfo=tz).date()
return v.astimezone(tz).date()

value_date = _as_date_in_tz(convert_value, convert_tzinfo)
Copy link
Collaborator

@akatsoulas akatsoulas Nov 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this PR! Regarding this helper method wouldn't be simpler if this call was

value_date = convert_value.date()

The edge cases that the as_date_in_tz function checks for have been handled in earlier steps. For example the check for Date objects is defined in line 248

kwargs_dt = {"format": "short", "tzinfo": convert_tzinfo, "locale": locale}
if value_date == today_date:
formatted = _lazy("Today at %s") % format_time(convert_value, **kwargs_dt)
elif format == "shortdatetime":
formatted = format_datetime(convert_value, **kwargs_dt)
else: # shortdate
formatted = format_date(convert_value, format="short", locale=locale)
case "longdatetime":
formatted = format_datetime(
convert_value, format="long", tzinfo=convert_tzinfo, locale=locale
)
case "date":
formatted = format_date(convert_value, locale=locale)
case "time":
formatted = format_time(convert_value, tzinfo=convert_tzinfo, locale=locale)
case "datetime":
formatted = format_datetime(convert_value, tzinfo=convert_tzinfo, locale=locale)
case "year":
formatted = format_datetime(
convert_value, format="yyyy", tzinfo=convert_tzinfo, locale=locale
)
case _:
raise DateTimeFormatError
return Markup('<time datetime="{}">{}</time>'.format(convert_value.isoformat(), formatted))


Expand Down