reformat with older version of yapf

bdraco · bdraco · commit c26ba7e2ef54 · 2022-09-11T12:36:07.000-05:00
diff --git a/dbus_next/_private/marshaller.py b/dbus_next/_private/marshaller.py
@@ -3,7 +3,6 @@
 
 
 class Marshaller:
-
     def __init__(self, signature, body):
         self.signature_tree = SignatureTree._get(signature)
         self.signature_tree.verify(body)
diff --git a/dbus_next/_private/util.py b/dbus_next/_private/util.py
@@ -101,7 +101,6 @@ def parse_annotation(annotation: str) -> str:
     In this case, we must eval the result which we do only when given a string
     constant.
     '''
-
     def raise_value_error():
         raise ValueError(f'service annotations must be a string constant (got {annotation})')
 
diff --git a/dbus_next/aio/message_bus.py b/dbus_next/aio/message_bus.py
@@ -28,7 +28,6 @@ def _future_set_result(fut, result):
 
 
 class _MessageWriter:
-
     def __init__(self, bus):
         self.messages = Queue()
         self.negotiate_unix_fd = bus._negotiate_unix_fd
@@ -115,7 +114,6 @@ class MessageBus(BaseMessageBus):
         and receive messages.
     :vartype connected: bool
     """
-
     def __init__(self,
                  bus_address: str = None,
                  bus_type: BusType = BusType.SESSION,
@@ -348,7 +346,6 @@ def _make_method_handler(self, interface, method):
             return super()._make_method_handler(interface, method)
 
         def handler(msg, send_reply):
-
             def done(fut):
                 with send_reply:
                     result = fut.result()
diff --git a/dbus_next/aio/proxy_object.py b/dbus_next/aio/proxy_object.py
@@ -72,9 +72,7 @@ class ProxyInterface(BaseProxyInterface):
     If the service returns an error for a DBus call, a :class:`DBusError
     <dbus_next.DBusError>` will be raised with information about the error.
     """
-
     def _add_method(self, intr_method):
-
         async def method_fn(*args, flags=MessageFlag.NONE):
             input_body, unix_fds = replace_fds_with_idx(intr_method.in_signature, list(args))
 
@@ -108,7 +106,6 @@ async def method_fn(*args, flags=MessageFlag.NONE):
         setattr(self, method_name, method_fn)
 
     def _add_property(self, intr_property):
-
         async def property_getter():
             msg = await self.bus.call(
                 Message(destination=self.bus_name,
@@ -154,7 +151,6 @@ class ProxyObject(BaseProxyObject):
 
     For more information, see the :class:`BaseProxyObject <dbus_next.proxy_object.BaseProxyObject>`.
     """
-
     def __init__(self, bus_name: str, path: str, introspection: Union[intr.Node, str, ET.Element],
                  bus: BaseMessageBus):
         super().__init__(bus_name, path, introspection, bus, ProxyInterface)
diff --git a/dbus_next/auth.py b/dbus_next/auth.py
@@ -35,7 +35,6 @@ class Authenticator:
 
     :seealso: https://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
     """
-
     def _authentication_start(self, negotiate_unix_fd=False):
         raise NotImplementedError(
             'authentication_start() must be implemented in the inheriting class')
@@ -54,7 +53,6 @@ class AuthExternal(Authenticator):
 
     :sealso: https://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
     """
-
     def __init__(self):
         self.negotiate_unix_fd = False
         self.negotiating_fds = False
@@ -86,7 +84,6 @@ class AuthAnnonymous(Authenticator):
 
     :sealso: https://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
     """
-
     def _authentication_start(self, negotiate_unix_fd=False) -> str:
         if negotiate_unix_fd:
             raise AuthError(
diff --git a/dbus_next/errors.py b/dbus_next/errors.py
@@ -31,25 +31,21 @@ class SignalDisabledError(Exception):
 
 
 class InvalidBusNameError(TypeError):
-
     def __init__(self, name):
         super().__init__(f'invalid bus name: {name}')
 
 
 class InvalidObjectPathError(TypeError):
-
     def __init__(self, path):
         super().__init__(f'invalid object path: {path}')
 
 
 class InvalidInterfaceNameError(TypeError):
-
     def __init__(self, name):
         super().__init__(f'invalid interface name: {name}')
 
 
 class InvalidMemberNameError(TypeError):
-
     def __init__(self, member):
         super().__init__(f'invalid member name: {member}')
 
@@ -60,7 +56,6 @@ def __init__(self, member):
 
 
 class DBusError(Exception):
-
     def __init__(self, type_, text, reply=None):
         super().__init__(text)
 
diff --git a/dbus_next/glib/message_bus.py b/dbus_next/glib/message_bus.py
@@ -24,7 +24,6 @@ class _GLibSource:
 
 
 class _MessageSource(_GLibSource):
-
     def __init__(self, bus):
         self.unmarshaller = None
         self.bus = bus
@@ -55,7 +54,6 @@ def dispatch(self, callback, user_data):
 
 
 class _MessageWritableSource(_GLibSource):
-
     def __init__(self, bus):
         self.bus = bus
         self.buf = b''
@@ -101,7 +99,6 @@ def dispatch(self, callback, user_data):
 
 
 class _AuthLineSource(_GLibSource):
-
     def __init__(self, stream):
         self.stream = stream
         self.buf = b''
@@ -149,7 +146,6 @@ class MessageBus(BaseMessageBus):
         be :class:`None` until the message bus connects.
     :vartype unique_name: str
     """
-
     def __init__(self,
                  bus_address: str = None,
                  bus_type: BusType = BusType.SESSION,
@@ -178,7 +174,6 @@ def connect(self, connect_notify: Callable[['MessageBus', Optional[Exception]],
             :class:`AuthError <dbus_next.AuthError>` on authorization errors.
         :type callback: :class:`Callable`
         """
-
         def authenticate_notify(exc):
             if exc is not None:
                 if connect_notify is not None:
diff --git a/dbus_next/glib/proxy_object.py b/dbus_next/glib/proxy_object.py
@@ -108,7 +108,6 @@ def set_callback(error: Exception)
     :class:`DBusError <dbus_next.DBusError>` will be raised with information
     about the error.
     """
-
     def _add_method(self, intr_method):
         in_len = len(intr_method.in_args)
         out_len = len(intr_method.out_args)
@@ -177,9 +176,7 @@ def callback(body, err):
         setattr(self, method_name_sync, method_fn_sync)
 
     def _add_property(self, intr_property):
-
         def property_getter(callback):
-
             def call_notify(msg, err):
                 if err:
                     callback(None, err)
@@ -229,7 +226,6 @@ def callback(value, err):
             return property_value
 
         def property_setter(value, callback):
-
             def call_notify(msg, err):
                 if err:
                     callback(None, err)
@@ -279,7 +275,6 @@ class ProxyObject(BaseProxyObject):
 
     For more information, see the :class:`BaseProxyObject <dbus_next.proxy_object.BaseProxyObject>`.
     """
-
     def __init__(self, bus_name: str, path: str, introspection: Union[intr.Node, str, ET.Element],
                  bus: BaseMessageBus):
         super().__init__(bus_name, path, introspection, bus, ProxyInterface)
diff --git a/dbus_next/introspection.py b/dbus_next/introspection.py
@@ -28,7 +28,6 @@ class Arg:
         - :class:`InvalidSignatureError <dbus_next.InvalidSignatureError>` - If the signature is not valid.
         - :class:`InvalidIntrospectionError <dbus_next.InvalidIntrospectionError>` - If the signature is not a single complete type.
     """
-
     def __init__(self,
                  signature: Union[SignatureType, str],
                  direction: List[ArgDirection] = None,
@@ -101,7 +100,6 @@ class Signal:
     :raises:
         - :class:`InvalidMemberNameError <dbus_next.InvalidMemberNameError>` - If the name of the signal is not a valid member name.
     """
-
     def __init__(self, name: str, args: List[Arg] = None):
         if name is not None:
             assert_member_name_valid(name)
@@ -165,7 +163,6 @@ class Method:
     :raises:
         - :class:`InvalidMemberNameError <dbus_next.InvalidMemberNameError>` - If the name of this method is not valid.
     """
-
     def __init__(self, name: str, in_args: List[Arg] = [], out_args: List[Arg] = []):
         assert_member_name_valid(name)
 
@@ -238,7 +235,6 @@ class Property:
         - :class `InvalidSignatureError <dbus_next.InvalidSignatureError>` - If the given signature is not valid.
         - :class: `InvalidMemberNameError <dbus_next.InvalidMemberNameError>` - If the member name is not valid.
     """
-
     def __init__(self,
                  name: str,
                  signature: str,
@@ -305,7 +301,6 @@ class Interface:
     :raises:
         - :class:`InvalidInterfaceNameError <dbus_next.InvalidInterfaceNameError>` - If the name is not a valid interface name.
     """
-
     def __init__(self,
                  name: str,
                  methods: List[Method] = None,
@@ -389,7 +384,6 @@ class Node:
     :raises:
         - :class:`InvalidIntrospectionError <dbus_next.InvalidIntrospectionError>` - If the name is not a valid node name.
     """
-
     def __init__(self, name: str = None, interfaces: List[Interface] = None, is_root: bool = True):
         if not is_root and not name:
             raise InvalidIntrospectionError('child nodes must have a "name" attribute')
diff --git a/dbus_next/message.py b/dbus_next/message.py
@@ -61,7 +61,6 @@ class Message:
         - :class:`InvalidMemberNameError` - If ``member`` is not a valid member name.
         - :class:`InvalidInterfaceNameError` - If ``error_name`` or ``interface`` is not a valid interface name.
     """
-
     def __init__(self,
                  destination: str = None,
                  path: str = None,
diff --git a/dbus_next/message_bus.py b/dbus_next/message_bus.py
@@ -47,7 +47,6 @@ class BaseMessageBus:
         and receive messages.
     :vartype connected: bool
     """
-
     def __init__(self,
                  bus_address: Optional[str] = None,
                  bus_type: BusType = BusType.SESSION,
@@ -628,7 +627,6 @@ def _send_reply(self, msg):
         bus = self
 
         class SendReply:
-
             def __enter__(self):
                 return self
 
@@ -728,7 +726,6 @@ def _process_message(self, msg):
                 del self._method_return_handlers[msg.reply_serial]
 
     def _make_method_handler(self, interface, method):
-
         def handler(msg, send_reply):
             args = ServiceInterface._msg_body_to_args(msg)
             result = method.fn(interface, *args)
diff --git a/dbus_next/proxy_object.py b/dbus_next/proxy_object.py
@@ -39,7 +39,6 @@ class BaseProxyInterface:
     :ivar bus: The message bus this proxy interface is connected to.
     :vartype bus: :class:`BaseMessageBus <dbus_next.message_bus.BaseMessageBus>`
     """
-
     def __init__(self, bus_name, path, introspection, bus):
 
         self.bus_name = bus_name
@@ -104,7 +103,6 @@ def _message_handler(self, msg):
                 asyncio.create_task(cb_result)
 
     def _add_signal(self, intr_signal, interface):
-
         def on_signal_fn(fn):
             fn_signature = inspect.signature(fn)
             if not callable(fn) or len(fn_signature.parameters) != len(intr_signal.args):
@@ -172,7 +170,6 @@ class BaseProxyObject:
         - :class:`InvalidObjectPathError <dbus_next.InvalidObjectPathError>` - If the given object path is not valid.
         - :class:`InvalidIntrospectionError <dbus_next.InvalidIntrospectionError>` - If the introspection data for the node is not valid.
     """
-
     def __init__(self, bus_name: str, path: str, introspection: Union[intr.Node, str, ET.Element],
                  bus: 'message_bus.BaseMessageBus', ProxyInterface: Type[BaseProxyInterface]):
         assert_object_path_valid(path)
diff --git a/dbus_next/service.py b/dbus_next/service.py
@@ -12,7 +12,6 @@
 
 
 class _Method:
-
     def __init__(self, fn, name, disabled=False):
         in_signature = ''
         out_signature = ''
@@ -87,7 +86,6 @@ def echo_two(self, val1: 's', val2: 'u') -> 'su':
 
     @no_type_check_decorator
     def decorator(fn):
-
         @wraps(fn)
         def wrapped(*args, **kwargs):
             fn(*args, **kwargs)
@@ -101,7 +99,6 @@ def wrapped(*args, **kwargs):
 
 
 class _Signal:
-
     def __init__(self, fn, name, disabled=False):
         inspection = inspect.signature(fn)
 
@@ -183,7 +180,6 @@ def wrapped(self, *args, **kwargs):
 
 
 class _Property(property):
-
     def set_options(self, options):
         self.options = getattr(self, 'options', {})
         for k, v in options.items():
@@ -318,7 +314,6 @@ class ServiceInterface:
         valid interface name.
     :vartype name: str
     """
-
     def __init__(self, name: str):
         # TODO cannot be overridden by a dbus member
         self.name = name
diff --git a/dbus_next/signature.py b/dbus_next/signature.py
@@ -301,7 +301,6 @@ class SignatureTree:
     :raises:
         :class:`InvalidSignatureError` if the given signature is not valid.
     """
-
     @staticmethod
     @lru_cache(maxsize=None)
     def _get(signature: str = '') -> "SignatureTree":
@@ -368,7 +367,6 @@ class Variant:
         :class:`InvalidSignatureError` if the signature is not valid.
         :class:`SignatureBodyMismatchError` if the signature does not match the body.
     """
-
     def __init__(self,
                  signature: Union[str, SignatureTree, SignatureType],
                  value: Any,
diff --git a/examples/example-service.py b/examples/example-service.py
@@ -12,7 +12,6 @@
 
 
 class ExampleInterface(ServiceInterface):
-
     def __init__(self, name):
         super().__init__(name)
         self._string_prop = 'kevin'
diff --git a/test/client/test_methods.py b/test/client/test_methods.py
@@ -10,7 +10,6 @@
 
 
 class ExampleInterface(ServiceInterface):
-
     def __init__(self):
         super().__init__('test.interface')
 
diff --git a/test/client/test_properties.py b/test/client/test_properties.py
@@ -8,7 +8,6 @@
 
 
 class ExampleInterface(ServiceInterface):
-
     def __init__(self):
         super().__init__('test.interface')
         self._some_property = 'foo'
diff --git a/test/client/test_signals.py b/test/client/test_signals.py
@@ -8,7 +8,6 @@
 
 
 class ExampleInterface(ServiceInterface):
-
     def __init__(self):
         super().__init__('test.interface')
 
diff --git a/test/service/test_decorators.py b/test/service/test_decorators.py
@@ -3,7 +3,6 @@
 
 
 class ExampleInterface(ServiceInterface):
-
     def __init__(self):
         super().__init__('test.interface')
         self._some_prop = 55
diff --git a/test/service/test_export.py b/test/service/test_export.py
diff --git a/test/service/test_methods.py b/test/service/test_methods.py
diff --git a/test/service/test_properties.py b/test/service/test_properties.py
diff --git a/test/service/test_signals.py b/test/service/test_signals.py
diff --git a/test/service/test_standard_interfaces.py b/test/service/test_standard_interfaces.py
diff --git a/test/test_big_message.py b/test/test_big_message.py
diff --git a/test/test_fd_passing.py b/test/test_fd_passing.py
diff --git a/test/test_marshaller.py b/test/test_marshaller.py
