Merge pull request #24 from koenvervloesem/bluetooth_numbers_v1

Upgrade to bluetooth-numbers 1.0 API

Author: koenvervloesem

setup.cfg

@@ -55,7 +55,7 @@ package_dir =
 # new major versions. This works if the required packages follow Semantic Versioning.
 # For more information, check out https://semver.org/.
 install_requires =
-    bluetooth-numbers>=0.2.1
+    bluetooth-numbers>=1.0.0,<2.0
     bleak>=0.19.0
     importlib-metadata; python_version<"3.8"
     textual>=0.6.0

src/humble_explorer/renderables.py

@@ -7,8 +7,8 @@
 from uuid import UUID
 
 from bleak.backends.scanner import AdvertisementData
-from bluetooth_numbers.companies import company
-from bluetooth_numbers.services import service
+from bluetooth_numbers import company, service
+from bluetooth_numbers.exceptions import UnknownCICError, UnknownUUIDError
 from rich._palettes import EIGHT_BIT_PALETTE
 from rich.style import Style
 from rich.table import Table
@@ -84,7 +84,7 @@ def __rich__(self) -> Text:
 
         try:
             return Text.assemble(colored_uuid, f" ({service[UUID(self.uuid128)]})")
-        except KeyError:
+        except UnknownUUIDError:
             return Text.assemble(colored_uuid, " (Unknown)")
 
 
@@ -97,7 +97,7 @@ def __init__(self, cic: int) -> None:
     def __rich__(self) -> Text:
         try:
             manufacturer_name = company[self.cic]
-        except KeyError:
+        except UnknownCICError:
             manufacturer_name = "Unknown"
 
         return Text.assemble(