From 5b09ace1f59cb0b0d617511483521f0f37cbfff5 Mon Sep 17 00:00:00 2001
From: Matthias Hagmann <16444067+MattHag@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:23:14 +0100
Subject: [PATCH] ruff: Apply single line import format

# Usage
pre-commit run --all-files

Related #2295
---
 lib/hid_parser/__init__.py                    | 11 +++-
 lib/hid_parser/data.py                        |  6 ++-
 lib/hidapi/__init__.py                        | 52 +++++++++----------
 lib/hidapi/hidconsole.py                      |  6 ++-
 lib/logitech_receiver/base.py                 |  3 +-
 lib/logitech_receiver/common.py               |  3 +-
 lib/logitech_receiver/device.py               | 12 ++++-
 lib/logitech_receiver/hidpp20.py              | 15 ++++--
 lib/logitech_receiver/listener.py             |  3 +-
 lib/logitech_receiver/notifications.py        |  3 +-
 lib/logitech_receiver/notify.py               |  4 +-
 lib/logitech_receiver/receiver.py             |  7 ++-
 lib/solaar/cli/__init__.py                    |  6 ++-
 lib/solaar/cli/config.py                      |  3 +-
 lib/solaar/cli/probe.py                       |  3 +-
 lib/solaar/cli/show.py                        |  7 ++-
 lib/solaar/gtk.py                             |  3 +-
 lib/solaar/ui/__init__.py                     | 13 +++--
 lib/solaar/ui/about.py                        |  3 +-
 lib/solaar/ui/action.py                       |  3 +-
 lib/solaar/ui/common.py                       |  3 +-
 lib/solaar/ui/config_panel.py                 |  7 ++-
 lib/solaar/ui/diversion_rules.py              | 18 +++++--
 lib/solaar/ui/notify.py                       |  3 +-
 lib/solaar/ui/pair_window.py                  |  6 ++-
 lib/solaar/ui/tray.py                         |  3 +-
 lib/solaar/ui/window.py                       |  7 ++-
 tests/logitech_receiver/test_hidpp10.py       |  3 +-
 .../logitech_receiver/test_hidpp20_simple.py  |  3 +-
 tests/logitech_receiver/test_receiver.py      |  3 +-
 30 files changed, 149 insertions(+), 73 deletions(-)

diff --git a/lib/hid_parser/__init__.py b/lib/hid_parser/__init__.py
index 5eb3366a..f5683b34 100644
--- a/lib/hid_parser/__init__.py
+++ b/lib/hid_parser/__init__.py
@@ -9,7 +9,16 @@ import textwrap
 import typing
 import warnings
 
-from typing import Any, Dict, Iterable, Iterator, List, Optional, Sequence, TextIO, Tuple, Union
+from typing import Any
+from typing import Dict
+from typing import Iterable
+from typing import Iterator
+from typing import List
+from typing import Optional
+from typing import Sequence
+from typing import TextIO
+from typing import Tuple
+from typing import Union
 
 if sys.version_info >= (3, 8):
     from typing import Literal
diff --git a/lib/hid_parser/data.py b/lib/hid_parser/data.py
index 2dfe6648..e83662c6 100644
--- a/lib/hid_parser/data.py
+++ b/lib/hid_parser/data.py
@@ -2,7 +2,11 @@
 
 import enum
 
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Tuple
 
 
 class _DataMeta(type):
diff --git a/lib/hidapi/__init__.py b/lib/hidapi/__init__.py
index c3245492..f9aa38ef 100644
--- a/lib/hidapi/__init__.py
+++ b/lib/hidapi/__init__.py
@@ -18,34 +18,30 @@
 import platform as _platform
 
 if _platform.system() in ("Darwin", "Windows"):
-    from hidapi.hidapi import (
-        close,  # noqa: F401
-        enumerate,  # noqa: F401
-        find_paired_node,  # noqa: F401
-        find_paired_node_wpid,  # noqa: F401
-        get_manufacturer,  # noqa: F401
-        get_product,  # noqa: F401
-        get_serial,  # noqa: F401
-        monitor_glib,  # noqa: F401
-        open,  # noqa: F401
-        open_path,  # noqa: F401
-        read,  # noqa: F401
-        write,  # noqa: F401
-    )
+    from hidapi.hidapi import close  # noqa: F401
+    from hidapi.hidapi import enumerate  # noqa: F401
+    from hidapi.hidapi import find_paired_node  # noqa: F401
+    from hidapi.hidapi import find_paired_node_wpid  # noqa: F401
+    from hidapi.hidapi import get_manufacturer  # noqa: F401
+    from hidapi.hidapi import get_product  # noqa: F401
+    from hidapi.hidapi import get_serial  # noqa: F401
+    from hidapi.hidapi import monitor_glib  # noqa: F401
+    from hidapi.hidapi import open  # noqa: F401
+    from hidapi.hidapi import open_path  # noqa: F401
+    from hidapi.hidapi import read  # noqa: F401
+    from hidapi.hidapi import write  # noqa: F401
 else:
-    from hidapi.udev import (
-        close,  # noqa: F401
-        enumerate,  # noqa: F401
-        find_paired_node,  # noqa: F401
-        find_paired_node_wpid,  # noqa: F401
-        get_manufacturer,  # noqa: F401
-        get_product,  # noqa: F401
-        get_serial,  # noqa: F401
-        monitor_glib,  # noqa: F401
-        open,  # noqa: F401
-        open_path,  # noqa: F401
-        read,  # noqa: F401
-        write,  # noqa: F401
-    )
+    from hidapi.udev import close  # noqa: F401
+    from hidapi.udev import enumerate  # noqa: F401
+    from hidapi.udev import find_paired_node  # noqa: F401
+    from hidapi.udev import find_paired_node_wpid  # noqa: F401
+    from hidapi.udev import get_manufacturer  # noqa: F401
+    from hidapi.udev import get_product  # noqa: F401
+    from hidapi.udev import get_serial  # noqa: F401
+    from hidapi.udev import monitor_glib  # noqa: F401
+    from hidapi.udev import open  # noqa: F401
+    from hidapi.udev import open_path  # noqa: F401
+    from hidapi.udev import read  # noqa: F401
+    from hidapi.udev import write  # noqa: F401
 
 __version__ = "0.9"
diff --git a/lib/hidapi/hidconsole.py b/lib/hidapi/hidconsole.py
index 74dc25a0..cd963edf 100644
--- a/lib/hidapi/hidconsole.py
+++ b/lib/hidapi/hidconsole.py
@@ -21,9 +21,11 @@ import readline
 import sys
 import time
 
-from binascii import hexlify, unhexlify
+from binascii import hexlify
+from binascii import unhexlify
 from select import select as _select
-from threading import Lock, Thread
+from threading import Lock
+from threading import Thread
 
 import hidapi as _hid
 
diff --git a/lib/logitech_receiver/base.py b/lib/logitech_receiver/base.py
index 03699c01..53c49dab 100644
--- a/lib/logitech_receiver/base.py
+++ b/lib/logitech_receiver/base.py
@@ -30,8 +30,9 @@ from time import time as _timestamp
 
 import hidapi as _hid
 
-from . import exceptions, hidpp20
+from . import exceptions
 from . import hidpp10_constants as _hidpp10_constants
+from . import hidpp20
 from . import hidpp20_constants as _hidpp20_constants
 from .base_usb import ALL as _RECEIVER_USB_IDS
 from .common import strhex as _strhex
diff --git a/lib/logitech_receiver/common.py b/lib/logitech_receiver/common.py
index 8f617743..f8bcd967 100644
--- a/lib/logitech_receiver/common.py
+++ b/lib/logitech_receiver/common.py
@@ -20,7 +20,8 @@
 from binascii import hexlify as _hexlify
 from collections import namedtuple
 from dataclasses import dataclass
-from typing import Optional, Union
+from typing import Optional
+from typing import Union
 
 import yaml as _yaml
 
diff --git a/lib/logitech_receiver/device.py b/lib/logitech_receiver/device.py
index e4e614c1..99874924 100644
--- a/lib/logitech_receiver/device.py
+++ b/lib/logitech_receiver/device.py
@@ -25,8 +25,16 @@ from typing import Optional
 import hidapi as _hid
 import solaar.configuration as _configuration
 
-from . import base, descriptors, exceptions, hidpp10, hidpp10_constants, hidpp20, hidpp20_constants, settings
-from .common import ALERT, Battery
+from . import base
+from . import descriptors
+from . import exceptions
+from . import hidpp10
+from . import hidpp10_constants
+from . import hidpp20
+from . import hidpp20_constants
+from . import settings
+from .common import ALERT
+from .common import Battery
 from .settings_templates import check_feature_settings as _check_feature_settings
 
 logger = logging.getLogger(__name__)
diff --git a/lib/logitech_receiver/hidpp20.py b/lib/logitech_receiver/hidpp20.py
index b420d1ed..a9a71e7b 100644
--- a/lib/logitech_receiver/hidpp20.py
+++ b/lib/logitech_receiver/hidpp20.py
@@ -21,12 +21,14 @@ import threading as _threading
 
 from struct import pack as _pack
 from struct import unpack as _unpack
-from typing import List, Optional
+from typing import List
+from typing import Optional
 
 import yaml as _yaml
 
-from . import exceptions, special_keys
+from . import exceptions
 from . import hidpp10_constants as _hidpp10_constants
+from . import special_keys
 from .common import Battery
 from .common import FirmwareInfo as _FirmwareInfo
 from .common import NamedInt as _NamedInt
@@ -35,7 +37,14 @@ from .common import UnsortedNamedInts as _UnsortedNamedInts
 from .common import bytes2int as _bytes2int
 from .common import crc16 as _crc16
 from .common import int2bytes as _int2bytes
-from .hidpp20_constants import CHARGE_LEVEL, CHARGE_STATUS, CHARGE_TYPE, DEVICE_KIND, ERROR, FEATURE, FIRMWARE_KIND, GESTURE
+from .hidpp20_constants import CHARGE_LEVEL
+from .hidpp20_constants import CHARGE_STATUS
+from .hidpp20_constants import CHARGE_TYPE
+from .hidpp20_constants import DEVICE_KIND
+from .hidpp20_constants import ERROR
+from .hidpp20_constants import FEATURE
+from .hidpp20_constants import FIRMWARE_KIND
+from .hidpp20_constants import GESTURE
 from .i18n import _
 
 logger = logging.getLogger(__name__)
diff --git a/lib/logitech_receiver/listener.py b/lib/logitech_receiver/listener.py
index 4de73864..44c7487e 100644
--- a/lib/logitech_receiver/listener.py
+++ b/lib/logitech_receiver/listener.py
@@ -19,7 +19,8 @@ import logging
 import queue
 import threading
 
-from . import base, exceptions
+from . import base
+from . import exceptions
 
 logger = logging.getLogger(__name__)
 
diff --git a/lib/logitech_receiver/notifications.py b/lib/logitech_receiver/notifications.py
index fd6626cd..d3c2783b 100644
--- a/lib/logitech_receiver/notifications.py
+++ b/lib/logitech_receiver/notifications.py
@@ -23,8 +23,9 @@ import threading as _threading
 from struct import unpack as _unpack
 
 from . import diversion as _diversion
-from . import hidpp10, hidpp20
+from . import hidpp10
 from . import hidpp10_constants as _hidpp10_constants
+from . import hidpp20
 from . import hidpp20_constants as _hidpp20_constants
 from . import settings_templates as _st
 from .base import DJ_MESSAGE_ID as _DJ_MESSAGE_ID
diff --git a/lib/logitech_receiver/notify.py b/lib/logitech_receiver/notify.py
index c90a4b8e..cd6e38b1 100644
--- a/lib/logitech_receiver/notify.py
+++ b/lib/logitech_receiver/notify.py
@@ -23,7 +23,9 @@ try:
 
     gi.require_version("Notify", "0.7")
     gi.require_version("Gtk", "3.0")
-    from gi.repository import GLib, Gtk, Notify  # this import is allowed to fail making the entire feature unavailable
+    from gi.repository import GLib  # this import is allowed to fail making the entire feature unavailable
+    from gi.repository import Gtk  # this import is allowed to fail making the entire feature unavailable
+    from gi.repository import Notify  # this import is allowed to fail making the entire feature unavailable
 
     available = True
 except (ValueError, ImportError):
diff --git a/lib/logitech_receiver/receiver.py b/lib/logitech_receiver/receiver.py
index 30f82a5f..ee0a6d15 100644
--- a/lib/logitech_receiver/receiver.py
+++ b/lib/logitech_receiver/receiver.py
@@ -24,10 +24,13 @@ from typing import Optional
 import hidapi as _hid
 
 from . import base as _base
-from . import exceptions, hidpp10, hidpp10_constants
+from . import exceptions
+from . import hidpp10
+from . import hidpp10_constants
 from .common import ALERT
 from .device import Device
-from .i18n import _, ngettext
+from .i18n import _
+from .i18n import ngettext
 
 logger = logging.getLogger(__name__)
 
diff --git a/lib/solaar/cli/__init__.py b/lib/solaar/cli/__init__.py
index c193d41a..5e1b324b 100644
--- a/lib/solaar/cli/__init__.py
+++ b/lib/solaar/cli/__init__.py
@@ -19,12 +19,14 @@ import logging
 import sys as _sys
 
 from importlib import import_module
-from traceback import extract_tb, format_exc
+from traceback import extract_tb
+from traceback import format_exc
 
 import logitech_receiver.device as _device
 import logitech_receiver.receiver as _receiver
 
-from logitech_receiver.base import receivers, receivers_and_devices
+from logitech_receiver.base import receivers
+from logitech_receiver.base import receivers_and_devices
 
 from solaar import NAME
 
diff --git a/lib/solaar/cli/config.py b/lib/solaar/cli/config.py
index d6acbbe0..7b44b01e 100644
--- a/lib/solaar/cli/config.py
+++ b/lib/solaar/cli/config.py
@@ -188,7 +188,8 @@ def run(receivers, args, find_receiver, find_device):
         import gi
 
         gi.require_version("Gtk", "3.0")
-        from gi.repository import Gio, Gtk
+        from gi.repository import Gio
+        from gi.repository import Gtk
 
         if Gtk.init_check()[0]:  # can Gtk be initialized?
             APP_ID = "io.github.pwr_solaar.solaar"
diff --git a/lib/solaar/cli/probe.py b/lib/solaar/cli/probe.py
index 3a2e3491..31e3d055 100644
--- a/lib/solaar/cli/probe.py
+++ b/lib/solaar/cli/probe.py
@@ -18,7 +18,8 @@ from logitech_receiver import base as _base
 from logitech_receiver import hidpp10_constants as _hidpp10_constants
 from logitech_receiver.common import strhex as _strhex
 
-from solaar.cli.show import _print_device, _print_receiver
+from solaar.cli.show import _print_device
+from solaar.cli.show import _print_receiver
 
 _R = _hidpp10_constants.REGISTERS
 
diff --git a/lib/solaar/cli/show.py b/lib/solaar/cli/show.py
index 555fba4e..979d6e4b 100644
--- a/lib/solaar/cli/show.py
+++ b/lib/solaar/cli/show.py
@@ -14,15 +14,18 @@
 ## with this program; if not, write to the Free Software Foundation, Inc.,
 ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from logitech_receiver import exceptions, hidpp10, hidpp20
+from logitech_receiver import exceptions
+from logitech_receiver import hidpp10
 from logitech_receiver import hidpp10_constants as _hidpp10_constants
+from logitech_receiver import hidpp20
 from logitech_receiver import hidpp20_constants as _hidpp20_constants
 from logitech_receiver import receiver as _receiver
 from logitech_receiver import settings_templates as _settings_templates
 from logitech_receiver.common import NamedInt as _NamedInt
 from logitech_receiver.common import strhex as _strhex
 
-from solaar import NAME, __version__
+from solaar import NAME
+from solaar import __version__
 
 _hidpp10 = hidpp10.Hidpp10()
 _hidpp20 = hidpp20.Hidpp20()
diff --git a/lib/solaar/gtk.py b/lib/solaar/gtk.py
index 3451000a..9637d231 100755
--- a/lib/solaar/gtk.py
+++ b/lib/solaar/gtk.py
@@ -36,7 +36,8 @@ import solaar.ui as _ui
 import solaar.ui.common as _common
 import solaar.upower as _upower
 
-from solaar import NAME, __version__
+from solaar import NAME
+from solaar import __version__
 
 logger = logging.getLogger(__name__)
 
diff --git a/lib/solaar/ui/__init__.py b/lib/solaar/ui/__init__.py
index 21a9a98c..bfb3805f 100644
--- a/lib/solaar/ui/__init__.py
+++ b/lib/solaar/ui/__init__.py
@@ -22,13 +22,20 @@ import yaml as _yaml
 from logitech_receiver.common import ALERT
 
 from solaar.i18n import _
-from solaar.ui.config_panel import change_setting, record_setting
+from solaar.ui.config_panel import change_setting
+from solaar.ui.config_panel import record_setting
 from solaar.ui.window import find_device
 
-from . import common, diversion_rules, notify, tray, window
+from . import common
+from . import diversion_rules
+from . import notify
+from . import tray
+from . import window
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gio, GLib, Gtk  # NOQA: E402
+from gi.repository import Gio  # NOQA: E402
+from gi.repository import GLib  # NOQA: E402
+from gi.repository import Gtk  # NOQA: E402
 
 logger = logging.getLogger(__name__)
 
diff --git a/lib/solaar/ui/about.py b/lib/solaar/ui/about.py
index 781e5702..13a9efa3 100644
--- a/lib/solaar/ui/about.py
+++ b/lib/solaar/ui/about.py
@@ -19,7 +19,8 @@ import logging
 
 from gi.repository import Gtk
 
-from solaar import NAME, __version__
+from solaar import NAME
+from solaar import __version__
 from solaar.i18n import _
 
 #
diff --git a/lib/solaar/ui/action.py b/lib/solaar/ui/action.py
index 8e0b263d..0db9a605 100644
--- a/lib/solaar/ui/action.py
+++ b/lib/solaar/ui/action.py
@@ -14,7 +14,8 @@
 ## with this program; if not, write to the Free Software Foundation, Inc.,
 ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from gi.repository import Gdk, Gtk
+from gi.repository import Gdk
+from gi.repository import Gtk
 
 from solaar.i18n import _
 
diff --git a/lib/solaar/ui/common.py b/lib/solaar/ui/common.py
index 91671fd7..95318e0d 100644
--- a/lib/solaar/ui/common.py
+++ b/lib/solaar/ui/common.py
@@ -22,7 +22,8 @@ from solaar.i18n import _
 from solaar.tasks import TaskRunner as _TaskRunner
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import GLib, Gtk  # NOQA: E402
+from gi.repository import GLib  # NOQA: E402
+from gi.repository import Gtk  # NOQA: E402
 
 logger = logging.getLogger(__name__)
 
diff --git a/lib/solaar/ui/config_panel.py b/lib/solaar/ui/config_panel.py
index e387ed9c..87311040 100644
--- a/lib/solaar/ui/config_panel.py
+++ b/lib/solaar/ui/config_panel.py
@@ -25,12 +25,15 @@ from logitech_receiver.hidpp20 import LEDEffectSetting as _LEDEffectSetting
 from logitech_receiver.settings import KIND as _SETTING_KIND
 from logitech_receiver.settings import SENSITIVITY_IGNORE as _SENSITIVITY_IGNORE
 
-from solaar.i18n import _, ngettext
+from solaar.i18n import _
+from solaar.i18n import ngettext
 
 from .common import ui_async as _ui_async
 
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gdk, GLib, Gtk  # NOQA: E402
+from gi.repository import Gdk  # NOQA: E402
+from gi.repository import GLib  # NOQA: E402
+from gi.repository import Gtk  # NOQA: E402
 
 logger = logging.getLogger(__name__)
 
diff --git a/lib/solaar/ui/diversion_rules.py b/lib/solaar/ui/diversion_rules.py
index 15685ade..4d77f195 100644
--- a/lib/solaar/ui/diversion_rules.py
+++ b/lib/solaar/ui/diversion_rules.py
@@ -17,17 +17,25 @@ import logging
 import string
 import threading
 
-from collections import defaultdict, namedtuple
+from collections import defaultdict
+from collections import namedtuple
 from contextlib import contextmanager as contextlib_contextmanager
 from copy import copy
-from dataclasses import dataclass, field
+from dataclasses import dataclass
+from dataclasses import field
 from shlex import quote as shlex_quote
 from typing import Dict
 
-from gi.repository import Gdk, GObject, Gtk
+from gi.repository import Gdk
+from gi.repository import GObject
+from gi.repository import Gtk
 from logitech_receiver import diversion as _DIV
-from logitech_receiver.common import NamedInt, NamedInts, UnsortedNamedInts
-from logitech_receiver.diversion import CLICK, DEPRESS, RELEASE
+from logitech_receiver.common import NamedInt
+from logitech_receiver.common import NamedInts
+from logitech_receiver.common import UnsortedNamedInts
+from logitech_receiver.diversion import CLICK
+from logitech_receiver.diversion import DEPRESS
+from logitech_receiver.diversion import RELEASE
 from logitech_receiver.diversion import XK_KEYS as _XK_KEYS
 from logitech_receiver.diversion import Key as _Key
 from logitech_receiver.diversion import buttons as _buttons
diff --git a/lib/solaar/ui/notify.py b/lib/solaar/ui/notify.py
index e896e78c..458134cc 100644
--- a/lib/solaar/ui/notify.py
+++ b/lib/solaar/ui/notify.py
@@ -34,7 +34,8 @@ try:
 
     gi.require_version("Notify", "0.7")
     # this import is allowed to fail, in which case the entire feature is unavailable
-    from gi.repository import GLib, Notify
+    from gi.repository import GLib
+    from gi.repository import Notify
 
     # assumed to be working since the import succeeded
     available = True
diff --git a/lib/solaar/ui/pair_window.py b/lib/solaar/ui/pair_window.py
index b1386893..4236da67 100644
--- a/lib/solaar/ui/pair_window.py
+++ b/lib/solaar/ui/pair_window.py
@@ -16,10 +16,12 @@
 
 import logging
 
-from gi.repository import GLib, Gtk
+from gi.repository import GLib
+from gi.repository import Gtk
 from logitech_receiver import hidpp10_constants as _hidpp10_constants
 
-from solaar.i18n import _, ngettext
+from solaar.i18n import _
+from solaar.i18n import ngettext
 
 from . import icons as _icons
 
diff --git a/lib/solaar/ui/tray.py b/lib/solaar/ui/tray.py
index 47a74a9a..c9b47d04 100644
--- a/lib/solaar/ui/tray.py
+++ b/lib/solaar/ui/tray.py
@@ -21,7 +21,8 @@ from time import time as _timestamp
 
 import gi
 
-from gi.repository import GLib, Gtk
+from gi.repository import GLib
+from gi.repository import Gtk
 from gi.repository.Gdk import ScrollDirection
 
 import solaar.gtk as gtk
diff --git a/lib/solaar/ui/window.py b/lib/solaar/ui/window.py
index eba142a1..cae04b3b 100644
--- a/lib/solaar/ui/window.py
+++ b/lib/solaar/ui/window.py
@@ -24,7 +24,8 @@ from logitech_receiver.common import NamedInt as _NamedInt
 from logitech_receiver.common import NamedInts as _NamedInts
 
 from solaar import NAME
-from solaar.i18n import _, ngettext
+from solaar.i18n import _
+from solaar.i18n import ngettext
 
 from . import action as _action
 from . import config_panel as _config_panel
@@ -36,7 +37,9 @@ from .diversion_rules import show_window as _show_diversion_window
 # from solaar import __version__ as VERSION
 
 gi.require_version("Gdk", "3.0")
-from gi.repository import Gdk, GLib, Gtk  # NOQA: E402
+from gi.repository import Gdk  # NOQA: E402
+from gi.repository import GLib  # NOQA: E402
+from gi.repository import Gtk  # NOQA: E402
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/logitech_receiver/test_hidpp10.py b/tests/logitech_receiver/test_hidpp10.py
index ca932e20..5bfa8412 100644
--- a/tests/logitech_receiver/test_hidpp10.py
+++ b/tests/logitech_receiver/test_hidpp10.py
@@ -1,6 +1,7 @@
 import pytest
 
-from lib.logitech_receiver import hidpp10, hidpp10_constants
+from lib.logitech_receiver import hidpp10
+from lib.logitech_receiver import hidpp10_constants
 
 
 class FakeDevice:
diff --git a/tests/logitech_receiver/test_hidpp20_simple.py b/tests/logitech_receiver/test_hidpp20_simple.py
index 319a3e63..b92e2823 100644
--- a/tests/logitech_receiver/test_hidpp20_simple.py
+++ b/tests/logitech_receiver/test_hidpp20_simple.py
@@ -5,7 +5,8 @@ from unittest import mock
 
 import pytest
 
-from lib.logitech_receiver import hidpp20, hidpp20_constants
+from lib.logitech_receiver import hidpp20
+from lib.logitech_receiver import hidpp20_constants
 
 DEVICE = "test_device"
 _hidpp20 = hidpp20.Hidpp20()
diff --git a/tests/logitech_receiver/test_receiver.py b/tests/logitech_receiver/test_receiver.py
index 8265f8a0..513ea2fa 100644
--- a/tests/logitech_receiver/test_receiver.py
+++ b/tests/logitech_receiver/test_receiver.py
@@ -2,7 +2,8 @@ from unittest import mock
 
 import pytest
 
-from logitech_receiver import exceptions, receiver
+from logitech_receiver import exceptions
+from logitech_receiver import receiver
 
 
 @pytest.mark.parametrize(