diff --git a/pyproject.toml b/pyproject.toml index 2332465..8527ae6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -115,3 +115,6 @@ line-length = 88 ignore = [ "F821", # undefined names are used for decorators ] +select = [ + "I", # isort formatting. +] diff --git a/src/dbus_fast/_private/marshaller.py b/src/dbus_fast/_private/marshaller.py index 7e3c727..c4c5f1f 100644 --- a/src/dbus_fast/_private/marshaller.py +++ b/src/dbus_fast/_private/marshaller.py @@ -1,4 +1,5 @@ from __future__ import annotations + from struct import Struct, error from typing import Any, Callable diff --git a/src/dbus_fast/_private/unmarshaller.py b/src/dbus_fast/_private/unmarshaller.py index 34cafbb..89b4641 100644 --- a/src/dbus_fast/_private/unmarshaller.py +++ b/src/dbus_fast/_private/unmarshaller.py @@ -7,7 +7,7 @@ import socket import sys from collections.abc import Iterable from struct import Struct -from typing import Any, Callable, TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Callable from ..constants import MESSAGE_FLAG_MAP, MESSAGE_TYPE_MAP, MessageFlag from ..errors import InvalidMessageError diff --git a/src/dbus_fast/_private/util.py b/src/dbus_fast/_private/util.py index 528b1cb..7a65dfd 100644 --- a/src/dbus_fast/_private/util.py +++ b/src/dbus_fast/_private/util.py @@ -4,7 +4,7 @@ import ast import inspect from typing import Any, Callable -from ..signature import SignatureTree, Variant, get_signature_tree, SignatureType +from ..signature import SignatureTree, SignatureType, Variant, get_signature_tree def signature_contains_type( diff --git a/src/dbus_fast/aio/__init__.py b/src/dbus_fast/aio/__init__.py index e04a895..8235332 100644 --- a/src/dbus_fast/aio/__init__.py +++ b/src/dbus_fast/aio/__init__.py @@ -1,2 +1,3 @@ from .message_bus import MessageBus as MessageBus -from .proxy_object import ProxyInterface as ProxyInterface, ProxyObject as ProxyObject +from .proxy_object import ProxyInterface as ProxyInterface +from .proxy_object import ProxyObject as ProxyObject diff --git a/src/dbus_fast/glib/__init__.py b/src/dbus_fast/glib/__init__.py index e04a895..8235332 100644 --- a/src/dbus_fast/glib/__init__.py +++ b/src/dbus_fast/glib/__init__.py @@ -1,2 +1,3 @@ from .message_bus import MessageBus as MessageBus -from .proxy_object import ProxyInterface as ProxyInterface, ProxyObject as ProxyObject +from .proxy_object import ProxyInterface as ProxyInterface +from .proxy_object import ProxyObject as ProxyObject diff --git a/src/dbus_fast/message_bus.py b/src/dbus_fast/message_bus.py index 7ad6eb9..d58f9b3 100644 --- a/src/dbus_fast/message_bus.py +++ b/src/dbus_fast/message_bus.py @@ -1,11 +1,12 @@ from __future__ import annotations + import inspect import logging import socket import traceback import xml.etree.ElementTree as ET from functools import partial -from typing import Any, Callable, TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Callable from . import introspection as intr from ._private.address import get_bus_address, parse_address @@ -23,7 +24,7 @@ from .errors import DBusError, InvalidAddressError from .message import Message from .proxy_object import BaseProxyObject from .send_reply import SendReply -from .service import ServiceInterface, _Method, _Property, HandlerType +from .service import HandlerType, ServiceInterface, _Method, _Property from .signature import Variant from .validators import assert_bus_name_valid, assert_object_path_valid diff --git a/src/dbus_fast/send_reply.py b/src/dbus_fast/send_reply.py index f7189b5..046ee4a 100644 --- a/src/dbus_fast/send_reply.py +++ b/src/dbus_fast/send_reply.py @@ -1,4 +1,5 @@ from __future__ import annotations + import traceback from types import TracebackType from typing import TYPE_CHECKING diff --git a/src/dbus_fast/service.py b/src/dbus_fast/service.py index 5f733cf..cb38832 100644 --- a/src/dbus_fast/service.py +++ b/src/dbus_fast/service.py @@ -1,4 +1,5 @@ from __future__ import annotations + import asyncio import copy import inspect @@ -15,13 +16,13 @@ from ._private.util import ( from .constants import PropertyAccess from .errors import SignalDisabledError from .message import Message +from .send_reply import SendReply from .signature import ( SignatureBodyMismatchError, SignatureTree, Variant, get_signature_tree, ) -from .send_reply import SendReply if TYPE_CHECKING: from .message_bus import BaseMessageBus diff --git a/tests/benchmarks/test_marshall.py b/tests/benchmarks/test_marshall.py index 17d333f..3aa6f4c 100644 --- a/tests/benchmarks/test_marshall.py +++ b/tests/benchmarks/test_marshall.py @@ -1,6 +1,7 @@ -from dbus_fast import Message from pytest_codspeed import BenchmarkFixture +from dbus_fast import Message + message = Message( destination="org.bluez", path="/", diff --git a/tests/benchmarks/test_unmarshall.py b/tests/benchmarks/test_unmarshall.py index 0edf209..45f785c 100644 --- a/tests/benchmarks/test_unmarshall.py +++ b/tests/benchmarks/test_unmarshall.py @@ -1,9 +1,9 @@ import io -from dbus_fast._private.unmarshaller import Unmarshaller - from pytest_codspeed import BenchmarkFixture +from dbus_fast._private.unmarshaller import Unmarshaller + def test_unmarshall_bluez_rssi_message(benchmark: BenchmarkFixture) -> None: bluez_rssi_message = ( diff --git a/tests/test_introspection.py b/tests/test_introspection.py index 097dbac..b02170a 100644 --- a/tests/test_introspection.py +++ b/tests/test_introspection.py @@ -2,9 +2,9 @@ import os from dbus_fast import ( ArgDirection, + InvalidMemberNameError, PropertyAccess, SignatureType, - InvalidMemberNameError, ) from dbus_fast import introspection as intr diff --git a/tests/test_marshaller.py b/tests/test_marshaller.py index 41bcf46..91a3af4 100644 --- a/tests/test_marshaller.py +++ b/tests/test_marshaller.py @@ -8,15 +8,14 @@ import pytest from dbus_fast import Message, MessageFlag, MessageType, SignatureTree, Variant from dbus_fast._private._cython_compat import FakeCython +from dbus_fast._private.constants import BIG_ENDIAN, LITTLE_ENDIAN from dbus_fast._private.unmarshaller import ( Unmarshaller, - is_compiled, buffer_to_int16, - buffer_to_uint32, buffer_to_uint16, + buffer_to_uint32, + is_compiled, ) -from dbus_fast._private.constants import BIG_ENDIAN, LITTLE_ENDIAN - from dbus_fast.unpack import unpack_variants diff --git a/tests/test_tcp_address.py b/tests/test_tcp_address.py index e0fcbe4..2d7dd83 100644 --- a/tests/test_tcp_address.py +++ b/tests/test_tcp_address.py @@ -1,8 +1,9 @@ import asyncio import os +from contextlib import suppress import pytest -from contextlib import suppress + from dbus_fast import Message from dbus_fast._private.address import parse_address from dbus_fast.aio import MessageBus