From 1041b106168fe00934c721c1764d53de912808d9 Mon Sep 17 00:00:00 2001
From: Tsvi Mostovicz <ttmost@gmail.com>
Date: Thu, 19 Sep 2019 19:19:27 +0300
Subject: [PATCH] Move alexa integration to use dt_util (#26723)

---
 homeassistant/components/alexa/capabilities.py    | 4 ++--
 homeassistant/components/alexa/flash_briefings.py | 4 ++--
 homeassistant/components/alexa/handlers.py        | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/alexa/capabilities.py b/homeassistant/components/alexa/capabilities.py
index d769f797da1..aeaa0a62c4b 100644
--- a/homeassistant/components/alexa/capabilities.py
+++ b/homeassistant/components/alexa/capabilities.py
@@ -1,5 +1,4 @@
 """Alexa capabilities."""
-from datetime import datetime
 import logging
 
 from homeassistant.const import (
@@ -16,6 +15,7 @@ from homeassistant.const import (
 import homeassistant.components.climate.const as climate
 from homeassistant.components import light, fan, cover
 import homeassistant.util.color as color_util
+import homeassistant.util.dt as dt_util
 
 from .const import (
     API_TEMP_UNITS,
@@ -109,7 +109,7 @@ class AlexaCapibility:
                     "name": prop_name,
                     "namespace": self.name(),
                     "value": prop_value,
-                    "timeOfSample": datetime.now().strftime(DATE_FORMAT),
+                    "timeOfSample": dt_util.utcnow().strftime(DATE_FORMAT),
                     "uncertaintyInMilliseconds": 0,
                 }
 
diff --git a/homeassistant/components/alexa/flash_briefings.py b/homeassistant/components/alexa/flash_briefings.py
index 708d1592e4c..0b5c1243764 100644
--- a/homeassistant/components/alexa/flash_briefings.py
+++ b/homeassistant/components/alexa/flash_briefings.py
@@ -1,9 +1,9 @@
 """Support for Alexa skill service end point."""
 import copy
-from datetime import datetime
 import logging
 import uuid
 
+import homeassistant.util.dt as dt_util
 from homeassistant.components import http
 from homeassistant.core import callback
 from homeassistant.helpers import template
@@ -89,7 +89,7 @@ class AlexaFlashBriefingView(http.HomeAssistantView):
                 else:
                     output[ATTR_REDIRECTION_URL] = item.get(CONF_DISPLAY_URL)
 
-            output[ATTR_UPDATE_DATE] = datetime.now().strftime(DATE_FORMAT)
+            output[ATTR_UPDATE_DATE] = dt_util.utcnow().strftime(DATE_FORMAT)
 
             briefing.append(output)
 
diff --git a/homeassistant/components/alexa/handlers.py b/homeassistant/components/alexa/handlers.py
index 1e636b96ee5..c72101460c4 100644
--- a/homeassistant/components/alexa/handlers.py
+++ b/homeassistant/components/alexa/handlers.py
@@ -1,5 +1,4 @@
 """Alexa message handlers."""
-from datetime import datetime
 import logging
 import math
 
@@ -28,6 +27,7 @@ from homeassistant.const import (
     TEMP_FAHRENHEIT,
 )
 import homeassistant.util.color as color_util
+import homeassistant.util.dt as dt_util
 from homeassistant.util.decorator import Registry
 from homeassistant.util.temperature import convert as convert_temperature
 
@@ -275,7 +275,7 @@ async def async_api_activate(hass, config, directive, context):
 
     payload = {
         "cause": {"type": Cause.VOICE_INTERACTION},
-        "timestamp": "%sZ" % (datetime.utcnow().isoformat(),),
+        "timestamp": f"{dt_util.utcnow().replace(tzinfo=None).isoformat()}Z",
     }
 
     return directive.response(
@@ -299,7 +299,7 @@ async def async_api_deactivate(hass, config, directive, context):
 
     payload = {
         "cause": {"type": Cause.VOICE_INTERACTION},
-        "timestamp": "%sZ" % (datetime.utcnow().isoformat(),),
+        "timestamp": f"{dt_util.utcnow().replace(tzinfo=None).isoformat()}Z",
     }
 
     return directive.response(