From 20ed40d7ade436eef1fcf25b5468bb3163434072 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen <balloob@gmail.com> Date: Fri, 27 Nov 2020 17:04:52 +0100 Subject: [PATCH] Use utcnow from date util for http.ban (#43686) --- homeassistant/components/http/ban.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/http/ban.py b/homeassistant/components/http/ban.py index 2c02cc7391f..14d81a1eb6e 100644 --- a/homeassistant/components/http/ban.py +++ b/homeassistant/components/http/ban.py @@ -15,7 +15,7 @@ from homeassistant.const import HTTP_BAD_REQUEST from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import HomeAssistantError import homeassistant.helpers.config_validation as cv -from homeassistant.util.yaml import dump +from homeassistant.util import dt as dt_util, yaml # mypy: allow-untyped-defs, no-check-untyped-defs @@ -179,7 +179,7 @@ class IpBan: def __init__(self, ip_ban: str, banned_at: Optional[datetime] = None) -> None: """Initialize IP Ban object.""" self.ip_address = ip_address(ip_ban) - self.banned_at = banned_at or datetime.utcnow() + self.banned_at = banned_at or dt_util.utcnow() async def async_load_ip_bans_config(hass: HomeAssistant, path: str) -> List[IpBan]: @@ -208,10 +208,6 @@ async def async_load_ip_bans_config(hass: HomeAssistant, path: str) -> List[IpBa def update_ip_bans_config(path: str, ip_ban: IpBan) -> None: """Update config file with new banned IP address.""" with open(path, "a") as out: - ip_ = { - str(ip_ban.ip_address): { - ATTR_BANNED_AT: ip_ban.banned_at.strftime("%Y-%m-%dT%H:%M:%S") - } - } + ip_ = {str(ip_ban.ip_address): {ATTR_BANNED_AT: ip_ban.banned_at.isoformat()}} out.write("\n") - out.write(dump(ip_)) + out.write(yaml.dump(ip_))