From 67e13b35db80ba4f716719733ed378820efca6d8 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Mon, 22 Nov 2021 17:28:10 +0100 Subject: [PATCH] Revert "Create new usb constants (#60086)" (#60137) Co-authored-by: epenet --- homeassistant/components/usb/__init__.py | 27 ++++++++---------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/homeassistant/components/usb/__init__.py b/homeassistant/components/usb/__init__.py index 8c39ba9e6be..355b60906b3 100644 --- a/homeassistant/components/usb/__init__.py +++ b/homeassistant/components/usb/__init__.py @@ -6,7 +6,7 @@ import fnmatch import logging import os import sys -from typing import Final, TypedDict +from typing import TypedDict from serial.tools.list_ports import comports from serial.tools.list_ports_common import ListPortInfo @@ -31,15 +31,6 @@ _LOGGER = logging.getLogger(__name__) REQUEST_SCAN_COOLDOWN = 60 # 1 minute cooldown -# Attributes for UsbServiceInfo -ATTR_DESCRIPTION: Final = "description" -ATTR_DEVICE: Final = "device" -ATTR_MANUFACTURER: Final = "manufacturer" -ATTR_PID: Final = "pid" -ATTR_SERIAL_NUMBER: Final = "serial_number" -ATTR_VID: Final = "vid" - - class UsbServiceInfo(TypedDict): """Prepared info from usb entries.""" @@ -180,20 +171,20 @@ class USBDiscovery: self.seen.add(device_tuple) matched = [] for matcher in self.usb: - if ATTR_VID in matcher and device.vid != matcher[ATTR_VID]: + if "vid" in matcher and device.vid != matcher["vid"]: continue - if ATTR_PID in matcher and device.pid != matcher[ATTR_PID]: + if "pid" in matcher and device.pid != matcher["pid"]: continue - if ATTR_SERIAL_NUMBER in matcher and not _fnmatch_lower( - device.serial_number, matcher[ATTR_SERIAL_NUMBER] + if "serial_number" in matcher and not _fnmatch_lower( + device.serial_number, matcher["serial_number"] ): continue - if ATTR_MANUFACTURER in matcher and not _fnmatch_lower( - device.manufacturer, matcher[ATTR_MANUFACTURER] + if "manufacturer" in matcher and not _fnmatch_lower( + device.manufacturer, matcher["manufacturer"] ): continue - if ATTR_DESCRIPTION in matcher and not _fnmatch_lower( - device.description, matcher[ATTR_DESCRIPTION] + if "description" in matcher and not _fnmatch_lower( + device.description, matcher["description"] ): continue matched.append(matcher)