From d124d0d2ea0aad266d0ce62d96d9f3115355ff31 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Wed, 9 Sep 2026 11:53:25 +0100 Subject: [PATCH 1/2] Reorder imports --- web_view.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web_view.py b/web_view.py index c64382d..62478e8 100755 --- a/web_view.py +++ b/web_view.py @@ -14,7 +14,8 @@ import time import traceback import typing from collections import defaultdict -from datetime import date, datetime, timedelta, timezone +from datetime import date +from datetime import datetime, timedelta, timezone from zoneinfo import ZoneInfo import flask @@ -25,8 +26,8 @@ import yaml from authlib.integrations.flask_client import OAuth from werkzeug.middleware.proxy_fix import ProxyFix -import agenda.data import agenda.conference +import agenda.data import agenda.error_mail import agenda.fx import agenda.holidays @@ -38,7 +39,7 @@ import agenda.trip_schengen import agenda.uk_school_holiday import agenda.utils import agenda.weather -from agenda import ical, calendar, format_list_with_ampersand, travel, uk_tz +from agenda import calendar, format_list_with_ampersand, ical, travel, uk_tz from agenda.event import Event from agenda.types import StrDict, Trip @@ -854,7 +855,6 @@ def sum_co2_by_transport_type(trips: list[Trip]) -> list[tuple[str, float]]: def get_home_weather() -> list[StrDict]: """Get Bristol home weather forecast, with date objects added for templates.""" - from datetime import date as date_type forecasts = agenda.weather.get_forecast( app.config["DATA_DIR"], @@ -864,7 +864,7 @@ def get_home_weather() -> list[StrDict]: cache_only=True, ) for f in forecasts: - f["date_obj"] = date_type.fromisoformat(f["date"]) + f["date_obj"] = date.fromisoformat(f["date"]) return forecasts From 2d224783b271828c74b37160e0d52ec189f31fba Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Wed, 9 Sep 2026 11:53:53 +0100 Subject: [PATCH 2/2] Drop 'conference: ' from titles in ical feed. --- web_view.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web_view.py b/web_view.py index 62478e8..7a0a37c 100755 --- a/web_view.py +++ b/web_view.py @@ -633,8 +633,7 @@ def build_conference_ical(items: list[StrDict]) -> bytes: ical.append_property(lines, "DTSTAMP", ical.format_datetime_utc(generated)) ical.append_property(lines, "DTSTART;VALUE=DATE", ical.format_date(start_date)) ical.append_property(lines, "DTEND;VALUE=DATE", ical.format_date(end_exclusive)) - summary = ical.escape_text(f"conference: {conf['name']}") - ical.append_property(lines, "SUMMARY", summary) + ical.append_property(lines, "SUMMARY", ical.escape_text(conf["name"])) description = ical.escape_text(_conference_description(conf)) ical.append_property(lines, "DESCRIPTION", description) if location := _conference_location(conf):