Skip to content

Fix deprecation warning #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iamDrakkir wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix deprecation warning #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions usbmonitor/__platform_specific_detectors/_linux_usb_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ def get_available_devices(self) -> dict[str, dict[str, str | tuple[str, ...]]]:
:return: dict[str, dict[str, str]]. The key is the device ID, the value is a dictionary of the device's
information.
"""
usb_devices = [device for device in self.context.list_devices(subsystem='usb') if ID_VENDOR_ID in device]
usb_devices = [device for device in self.context.list_devices(subsystem='usb') if ID_VENDOR_ID in device.properties]
devices_info = {}
for device in usb_devices:
device_id = device[DEVNAME]
device_info = {attr: device.get(attr, "") for attr in DEVICE_ATTRIBUTES}
device_id = device.properties[DEVNAME]
device_info = {attr: device.properties.get(attr, "") for attr in DEVICE_ATTRIBUTES}
device_info = self.__generate_tuple_attributes_from_string(device_info=device_info)
devices_info[device_id] = device_info

Expand Down Expand Up @@ -65,10 +65,10 @@ def _monitor_changes(self, on_connect: callable | None = None, on_disconnect: ca

def __handle_device_event(device):
action = device.action
if device.get(DEVTYPE) == 'usb_device':
device_id = device[DEVNAME]
if device.properties.get(DEVTYPE) == 'usb_device':
device_id = device.properties[DEVNAME]
if action == "add" and on_connect is not None:
device_info = {attr: device.get(attr, "") for attr in DEVICE_ATTRIBUTES}
device_info = {attr: device.properties.get(attr, "") for attr in DEVICE_ATTRIBUTES}
device_info = self.__generate_tuple_attributes_from_string(device_info=device_info)
on_connect(device_id, device_info)
self.last_check_devices = self.get_available_devices()
Expand Down