From 8a112721fade61b2e670d4f90bfb6e239eca66f3 Mon Sep 17 00:00:00 2001
From: Ryan Fleming <rfleming71@users.noreply.github.com>
Date: Sat, 30 Jan 2021 02:00:27 -0500
Subject: [PATCH] Fix feedback from UVC (#45630)

* Fixing feedback from UVC

* Couple of fixes
---
 homeassistant/components/uvc/camera.py | 10 ++++++----
 tests/components/uvc/test_camera.py    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/uvc/camera.py b/homeassistant/components/uvc/camera.py
index 4f5cfa3907e..ae10c7db48f 100644
--- a/homeassistant/components/uvc/camera.py
+++ b/homeassistant/components/uvc/camera.py
@@ -2,6 +2,7 @@
 from datetime import datetime
 import logging
 import re
+from typing import Optional
 
 import requests
 from uvcclient import camera as uvc_camera, nvr
@@ -111,9 +112,9 @@ class UnifiVideoCamera(Camera):
         return 0
 
     @property
-    def state_attributes(self):
+    def device_state_attributes(self):
         """Return the camera state attributes."""
-        attr = super().state_attributes
+        attr = {}
         if self.motion_detection_enabled:
             attr["last_recording_start_time"] = timestamp_ms_to_date(
                 self._caminfo["lastRecordingStartTime"]
@@ -124,7 +125,7 @@ class UnifiVideoCamera(Camera):
     def is_recording(self):
         """Return true if the camera is recording."""
         recording_state = "DISABLED"
-        if "recordingIndicator" in self._caminfo.keys():
+        if "recordingIndicator" in self._caminfo:
             recording_state = self._caminfo["recordingIndicator"]
 
         return (
@@ -256,7 +257,8 @@ class UnifiVideoCamera(Camera):
         self._caminfo = self._nvr.get_camera(self._uuid)
 
 
-def timestamp_ms_to_date(epoch_ms) -> datetime or None:
+def timestamp_ms_to_date(epoch_ms: int) -> Optional[datetime]:
     """Convert millisecond timestamp to datetime."""
     if epoch_ms:
         return datetime.fromtimestamp(epoch_ms / 1000)
+    return None
diff --git a/tests/components/uvc/test_camera.py b/tests/components/uvc/test_camera.py
index 00c827b9973..1dd44625ebe 100644
--- a/tests/components/uvc/test_camera.py
+++ b/tests/components/uvc/test_camera.py
@@ -257,7 +257,7 @@ class TestUVC(unittest.TestCase):
         assert not self.uvc.is_recording
         assert (
             datetime(2021, 1, 8, 1, 56, 32, 367000)
-            == self.uvc.state_attributes["last_recording_start_time"]
+            == self.uvc.device_state_attributes["last_recording_start_time"]
         )
 
         self.nvr.get_camera.return_value["recordingIndicator"] = "DISABLED"