lint: tidying up code in block tasks

This commit is contained in:
Iain Learmonth 2022-06-17 12:42:42 +01:00
parent a0da4d4641
commit ac5a604587
8 changed files with 86 additions and 49 deletions

View file

@ -1,5 +1,5 @@
from datetime import datetime, timedelta, timezone
from typing import Optional, Union
from typing import Optional
from flask import Blueprint, render_template, request
from flask.typing import ResponseReturnValue
@ -55,7 +55,7 @@ def format_datetime(s: Optional[datetime]) -> str:
@portal.app_template_filter("describe_brn")
def describe_brn(s: str) -> Union[str, Markup]:
def describe_brn(s: str) -> ResponseReturnValue:
parts = s.split(":")
if parts[3] == "mirror":
if parts[5].startswith("origin/"):
@ -71,7 +71,8 @@ def describe_brn(s: str) -> Union[str, Markup]:
).first()
if not proxy:
return s
return Markup(f"Proxy: {proxy.url}<br>({proxy.origin.group.group_name}: {proxy.origin.domain_name})") # type: ignore
return Markup( # type: ignore[no-untyped-call]
f"Proxy: {proxy.url}<br>({proxy.origin.group.group_name}: {proxy.origin.domain_name})")
if parts[5].startswith("quota/"):
if parts[4] == "cloudfront":
return f"Quota: CloudFront {parts[5][len('quota/'):]}"