pybricksdev: use absolute imports

dlech · dlech · commit f93fba92925f · 2025-01-18T17:41:46.000-06:00
Change imports from relative to absolute. Quick fix tools in the IDE
will automatically generate absolute imports so if we stick with that
we can use the tools without having to manually fix the imports. Also
absolute imports can be easier to understand if you don't know the
folder structure by heart.
diff --git a/pybricksdev/__main__.py b/pybricksdev/__main__.py
@@ -3,7 +3,7 @@
 
 """Main entry point for running pybricksdev as a module."""
 
-from .cli import main
+from pybricksdev.cli import main
 
 if __name__ == "__main__":
     main()
diff --git a/pybricksdev/_vendored/pynxt/flash.py b/pybricksdev/_vendored/pynxt/flash.py
@@ -4,7 +4,7 @@
 import math
 from importlib.resources import read_binary
 
-from . import resources
+from pybricksdev._vendored.pynxt import resources
 
 # Mnemonics for the addresses of the various registers used by the flash
 # controller.
diff --git a/pybricksdev/_vendored/pynxt/samba.py b/pybricksdev/_vendored/pynxt/samba.py
@@ -3,7 +3,7 @@
 
 import struct
 
-from . import lowlevel
+from pybricksdev._vendored.pynxt import lowlevel
 
 ATMEL_VENDOR_ID = 0x03EB
 SAMBA_PRODUCT_ID = 0x6124
diff --git a/pybricksdev/ble/__init__.py b/pybricksdev/ble/__init__.py
@@ -9,8 +9,8 @@
 from bleak.backends.device import BLEDevice
 from bleak.backends.scanner import AdvertisementData
 
-from ..tools import chunk
-from .pybricks import PYBRICKS_SERVICE_UUID
+from pybricksdev.ble.pybricks import PYBRICKS_SERVICE_UUID
+from pybricksdev.tools import chunk
 
 logger = logging.getLogger(__name__)
 
diff --git a/pybricksdev/ble/lwp3/__init__.py b/pybricksdev/ble/lwp3/__init__.py
@@ -6,7 +6,7 @@
 communications with devices that provide the LEGO Wireless Protocol v3.
 """
 
-from .bytecodes import Capabilities, HubKind, LastNetwork, Status
+from pybricksdev.ble.lwp3.bytecodes import Capabilities, HubKind, LastNetwork, Status
 
 # LEGO Wireless Protocol v3 is defined at:
 # https://lego.github.io/lego-ble-wireless-protocol-docs/
diff --git a/pybricksdev/ble/lwp3/bootloader.py b/pybricksdev/ble/lwp3/bootloader.py
@@ -8,7 +8,7 @@
 
 from enum import IntEnum
 
-from .bytecodes import Capabilities, HubKind, Version
+from pybricksdev.ble.lwp3.bytecodes import Capabilities, HubKind, Version
 
 # Bootloader characteristic bytecodes
 
diff --git a/pybricksdev/ble/lwp3/messages.py b/pybricksdev/ble/lwp3/messages.py
@@ -15,8 +15,7 @@
 from enum import IntEnum
 from typing import Any, Dict, List, NamedTuple, Optional, Tuple, Type, Union, overload
 
-from ...tools.checksum import xor_bytes
-from .bytecodes import (
+from pybricksdev.ble.lwp3.bytecodes import (
     MAX_NAME_SIZE,
     AlertKind,
     AlertOperation,
@@ -52,6 +51,7 @@
     Version,
     VirtualPortSetupCommand,
 )
+from pybricksdev.tools.checksum import xor_bytes
 
 
 class AbstractMessage(abc.ABC):
diff --git a/pybricksdev/ble/oad/__init__.py b/pybricksdev/ble/oad/__init__.py
@@ -7,10 +7,10 @@
 https://software-dl.ti.com/lprf/sdg-latest/html/oad-ble-stack-3.x/oad_profile.html
 """
 
-from ._common import OADReturn, oad_uuid
-from .control_point import OADControlPoint
-from .image_block import OADImageBlock
-from .image_identify import OADImageIdentify
+from pybricksdev.ble.oad._common import OADReturn, oad_uuid
+from pybricksdev.ble.oad.control_point import OADControlPoint
+from pybricksdev.ble.oad.image_block import OADImageBlock
+from pybricksdev.ble.oad.image_identify import OADImageIdentify
 
 __all__ = [
     "OAD_SERVICE_UUID",
diff --git a/pybricksdev/ble/oad/control_point.py b/pybricksdev/ble/oad/control_point.py
@@ -8,7 +8,7 @@
 from bleak import BleakClient
 from bleak.exc import BleakError
 
-from ._common import OADReturn, SoftwareVersion, oad_uuid
+from pybricksdev.ble.oad._common import OADReturn, SoftwareVersion, oad_uuid
 
 __all__ = ["OADControlPoint"]
 
diff --git a/pybricksdev/ble/oad/firmware.py b/pybricksdev/ble/oad/firmware.py
@@ -4,7 +4,7 @@
 import struct
 from typing import NamedTuple
 
-from ._common import ImageInfo, SoftwareVersion
+from pybricksdev.ble.oad._common import ImageInfo, SoftwareVersion
 
 # More info at:
 # https://github.com/TexasInstruments/simplelink-lowpower-f3-sdk/blob/main/tools/common/oad/oad_image_tool.py
diff --git a/pybricksdev/ble/oad/image_block.py b/pybricksdev/ble/oad/image_block.py
@@ -10,7 +10,7 @@
 
 from bleak import BleakClient
 
-from ._common import oad_uuid
+from pybricksdev.ble.oad._common import oad_uuid
 
 __all__ = ["OADImageBlock"]
 
diff --git a/pybricksdev/ble/oad/image_identify.py b/pybricksdev/ble/oad/image_identify.py
@@ -13,7 +13,7 @@
 from bleak import BleakClient
 from bleak.exc import BleakError
 
-from ._common import ImageInfo, OADReturn, SoftwareVersion, oad_uuid
+from pybricksdev.ble.oad._common import ImageInfo, OADReturn, SoftwareVersion, oad_uuid
 
 __all__ = ["OADImageIdentify"]
 
diff --git a/pybricksdev/cli/__init__.py b/pybricksdev/cli/__init__.py
@@ -18,8 +18,8 @@
 import argcomplete
 from argcomplete.completers import FilesCompleter
 
-from .. import __name__ as MODULE_NAME
-from .. import __version__ as MODULE_VERSION
+from pybricksdev import __name__ as MODULE_NAME
+from pybricksdev import __version__ as MODULE_VERSION
 
 PROG_NAME = (
     f"{path.basename(sys.executable)} -m {MODULE_NAME}"
@@ -112,7 +112,7 @@ def add_parser(self, subparsers: argparse._SubParsersAction):
         parser.tool = self
 
     async def run(self, args: argparse.Namespace):
-        from ..compile import compile_multi_file, print_mpy
+        from pybricksdev.compile import compile_multi_file, print_mpy
 
         with _get_script_path(args.file) as script_path:
             mpy = await compile_multi_file(script_path, args.abi)
@@ -171,10 +171,10 @@ def add_parser(self, subparsers: argparse._SubParsersAction):
             )
 
     async def run(self, args: argparse.Namespace):
-        from ..ble import find_device
-        from ..connections.ev3dev import EV3Connection
-        from ..connections.lego import REPLHub
-        from ..connections.pybricks import PybricksHub
+        from pybricksdev.ble import find_device
+        from pybricksdev.connections.ev3dev import EV3Connection
+        from pybricksdev.connections.lego import REPLHub
+        from pybricksdev.connections.pybricks import PybricksHub
 
         # Pick the right connection
         if args.conntype == "ssh":
@@ -225,7 +225,7 @@ def add_parser(self, subparsers: argparse._SubParsersAction):
         )
 
     def run(self, args: argparse.Namespace):
-        from .flash import flash_firmware
+        from pybricksdev.cli.flash import flash_firmware
 
         return flash_firmware(args.firmware, args.name)
 
@@ -242,7 +242,7 @@ def add_parser(self, subparsers: argparse._SubParsersAction):
         ).completer = FilesCompleter(allowednames=(".bin",))
 
     async def run(self, args: argparse.Namespace):
-        from ..dfu import backup_dfu
+        from pybricksdev.dfu import backup_dfu
 
         backup_dfu(args.firmware)
 
@@ -262,7 +262,7 @@ def add_parser(self, subparsers: argparse._SubParsersAction):
         ).completer = FilesCompleter(allowednames=(".bin",))
 
     async def run(self, args: argparse.Namespace):
-        from ..dfu import restore_dfu
+        from pybricksdev.dfu import restore_dfu
 
         restore_dfu(args.firmware)
 
@@ -305,7 +305,7 @@ def add_parser(self, subparsers: argparse._SubParsersAction):
         ).completer = FilesCompleter(allowednames=(".oda",))
 
     async def run(self, args: argparse.Namespace):
-        from .oad import flash_oad_image
+        from pybricksdev.cli.oad import flash_oad_image
 
         await flash_oad_image(args.firmware)
 
@@ -319,7 +319,7 @@ def add_parser(self, subparsers: argparse._SubParsersAction):
         parser.tool = self
 
     async def run(self, args: argparse.Namespace):
-        from .oad import dump_oad_info
+        from pybricksdev.cli.oad import dump_oad_info
 
         await dump_oad_info()
 
@@ -356,7 +356,7 @@ def add_parser(self, subparsers: argparse._SubParsersAction):
         parser.tool = self
 
     def run(self, args: argparse.Namespace):
-        from .lwp3.repl import repl, setup_repl_logging
+        from pybricksdev.cli.lwp3.repl import repl, setup_repl_logging
 
         setup_repl_logging()
         return repl()
@@ -392,7 +392,7 @@ def add_parser(self, subparsers: argparse._SubParsersAction):
     async def run(self, args: argparse.Namespace):
         from importlib.resources import read_text
 
-        from .. import resources
+        from pybricksdev import resources
 
         print(read_text(resources, resources.UDEV_RULES))
 
diff --git a/pybricksdev/cli/flash.py b/pybricksdev/cli/flash.py
@@ -19,23 +19,23 @@
 from tqdm.auto import tqdm
 from tqdm.contrib.logging import logging_redirect_tqdm
 
-from ..ble.lwp3 import (
+from pybricksdev.ble.lwp3 import (
     LEGO_CID,
     LWP3_BOOTLOADER_SERVICE_UUID,
     LWP3_HUB_CHARACTERISTIC_UUID,
     LWP3_HUB_SERVICE_UUID,
 )
-from ..ble.lwp3 import AdvertisementData as HubAdvertisementData
-from ..ble.lwp3.bootloader import BootloaderAdvertisementData
-from ..ble.lwp3.bytecodes import HubKind, HubProperty
-from ..ble.lwp3.messages import (
+from pybricksdev.ble.lwp3 import AdvertisementData as HubAdvertisementData
+from pybricksdev.ble.lwp3.bootloader import BootloaderAdvertisementData
+from pybricksdev.ble.lwp3.bytecodes import HubKind, HubProperty
+from pybricksdev.ble.lwp3.messages import (
     FirmwareUpdateMessage,
     HubPropertyRequestUpdate,
     HubPropertyUpdate,
     parse_message,
 )
-from ..ble.nus import NUS_RX_UUID, NUS_TX_UUID
-from ..ble.pybricks import (
+from pybricksdev.ble.nus import NUS_RX_UUID, NUS_TX_UUID
+from pybricksdev.ble.pybricks import (
     FW_REV_UUID,
     PNP_ID_UUID,
     PYBRICKS_COMMAND_EVENT_UUID,
@@ -44,13 +44,13 @@
     Command,
     unpack_pnp_id,
 )
-from ..compile import compile_file
-from ..connections.lego import REPLHub
-from ..dfu import flash_dfu
-from ..firmware import create_firmware_blob
-from ..flash import BootloaderConnection
-from ..tools import chunk
-from ..tools.checksum import xor_bytes
+from pybricksdev.compile import compile_file
+from pybricksdev.connections.lego import REPLHub
+from pybricksdev.dfu import flash_dfu
+from pybricksdev.firmware import create_firmware_blob
+from pybricksdev.flash import BootloaderConnection
+from pybricksdev.tools import chunk
+from pybricksdev.tools.checksum import xor_bytes
 
 logger = logging.getLogger(__name__)
 
@@ -335,9 +335,9 @@ async def flash_nxt(firmware: bytes) -> None:
         firmware:
             A firmware blob with the NxOS header appended to the end.
     """
-    from .._vendored.pynxt.firmware import Firmware
-    from .._vendored.pynxt.flash import FlashController
-    from .._vendored.pynxt.samba import SambaBrick, SambaOpenError
+    from pybricksdev._vendored.pynxt.firmware import Firmware
+    from pybricksdev._vendored.pynxt.flash import FlashController
+    from pybricksdev._vendored.pynxt.samba import SambaBrick, SambaOpenError
 
     # parse the header
     info = Firmware(firmware)
@@ -375,7 +375,7 @@ async def flash_ev3(firmware: bytes) -> None:
         firmware:
             A firmware blob.
     """
-    from ..connections.ev3 import EV3Bootloader
+    from pybricksdev.connections.ev3 import EV3Bootloader
 
     # TODO: nice error message and exit(1) if EV3 is not found
     with EV3Bootloader() as bootloader:
diff --git a/pybricksdev/cli/lwp3/repl.py b/pybricksdev/cli/lwp3/repl.py
@@ -25,15 +25,15 @@
 from prompt_toolkit.history import FileHistory
 from prompt_toolkit.patch_stdout import StdoutProxy, patch_stdout
 
-from ...ble.lwp3 import (
+from pybricksdev.ble.lwp3 import (
     LEGO_CID,
     LWP3_HUB_CHARACTERISTIC_UUID,
     LWP3_HUB_SERVICE_UUID,
     bytecodes,
     messages,
 )
-from ...ble.lwp3.bytecodes import Capabilities, HubKind, LastNetwork, Status
-from ...ble.lwp3.messages import AbstractMessage, parse_message
+from pybricksdev.ble.lwp3.bytecodes import Capabilities, HubKind, LastNetwork, Status
+from pybricksdev.ble.lwp3.messages import AbstractMessage, parse_message
 
 logger = logging.getLogger(__name__)
 history_file = Path(user_cache_dir("pybricksdev"), "lwp3-explorer-history.txt")
diff --git a/pybricksdev/cli/oad.py b/pybricksdev/cli/oad.py
@@ -10,13 +10,18 @@
 from tqdm.auto import tqdm
 from tqdm.contrib.logging import logging_redirect_tqdm
 
-from ..ble.lwp3 import LEGO_CID, LWP3_HUB_SERVICE_UUID, HubKind
-from ..ble.oad import OADControlPoint, OADImageBlock, OADImageIdentify, OADReturn
-from ..ble.oad.control_point import (
+from pybricksdev.ble.lwp3 import LEGO_CID, LWP3_HUB_SERVICE_UUID, HubKind
+from pybricksdev.ble.oad import (
+    OADControlPoint,
+    OADImageBlock,
+    OADImageIdentify,
+    OADReturn,
+)
+from pybricksdev.ble.oad.control_point import (
     OAD_LEGO_MARIO_DEVICE_TYPE,
     OAD_LEGO_TECHNIC_MOVE_DEVICE_TYPE,
 )
-from ..ble.oad.firmware import parse_oad_header
+from pybricksdev.ble.oad.firmware import parse_oad_header
 
 __all__ = ["dump_oad_info", "flash_oad_image"]
 
diff --git a/pybricksdev/compile.py b/pybricksdev/compile.py
@@ -10,7 +10,7 @@
 import mpy_cross_v5
 import mpy_cross_v6
 
-from .tools import chunk
+from pybricksdev.tools import chunk
 
 logger = logging.getLogger(__name__)
 
diff --git a/pybricksdev/connections/ev3.py b/pybricksdev/connections/ev3.py
@@ -9,7 +9,7 @@
 
 import hid
 
-from ..tools import chunk
+from pybricksdev.tools import chunk
 
 LEGO_VENDOR_ID = 0x0694
 EV3_PRODUCT_ID = 0x0005
diff --git a/pybricksdev/connections/lego.py b/pybricksdev/connections/lego.py
@@ -7,8 +7,8 @@
 from serial import Serial
 from serial.tools import list_ports
 
-from ..tools import chunk
-from .pybricks import PybricksHub
+from pybricksdev.connections.pybricks import PybricksHub
+from pybricksdev.tools import chunk
 
 FILE_PACKET_SIZE = 1024
 FILE_TRANSFER_SCRIPT = f"""
diff --git a/pybricksdev/connections/pybricks.py b/pybricksdev/connections/pybricks.py
@@ -18,9 +18,9 @@
 from tqdm.auto import tqdm
 from tqdm.contrib.logging import logging_redirect_tqdm
 
-from ..ble.lwp3.bytecodes import HubKind
-from ..ble.nus import NUS_RX_UUID, NUS_TX_UUID
-from ..ble.pybricks import (
+from pybricksdev.ble.lwp3.bytecodes import HubKind
+from pybricksdev.ble.nus import NUS_RX_UUID, NUS_TX_UUID
+from pybricksdev.ble.pybricks import (
     FW_REV_UUID,
     PNP_ID_UUID,
     PYBRICKS_COMMAND_EVENT_UUID,
@@ -34,10 +34,10 @@
     unpack_hub_capabilities,
     unpack_pnp_id,
 )
-from ..compile import compile_file, compile_multi_file
-from ..tools import chunk
-from ..tools.checksum import xor_bytes
-from . import ConnectionState
+from pybricksdev.compile import compile_file, compile_multi_file
+from pybricksdev.connections import ConnectionState
+from pybricksdev.tools import chunk
+from pybricksdev.tools.checksum import xor_bytes
 
 logger = logging.getLogger(__name__)
 
diff --git a/pybricksdev/dfu.py b/pybricksdev/dfu.py
diff --git a/pybricksdev/firmware.py b/pybricksdev/firmware.py
diff --git a/pybricksdev/flash.py b/pybricksdev/flash.py
