dont use future annotations

Author: Tony Crisci

dbus_next/aio/message_bus.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from ..message_bus import BaseMessageBus
 from .._private.unmarshaller import Unmarshaller
 from ..message import Message
@@ -41,7 +39,7 @@ def __init__(self, bus_address: str = None, bus_type: BusType = BusType.SESSION)
         self._loop = asyncio.get_event_loop()
         self._unmarshaller = Unmarshaller(self._stream)
 
-    async def connect(self) -> MessageBus:
+    async def connect(self) -> 'MessageBus':
         """Connect this message bus to the DBus daemon.
 
         This method must be called before the message bus can be used.

dbus_next/aio/proxy_object.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from ..proxy_object import BaseProxyObject, BaseProxyInterface
 from ..message_bus import BaseMessageBus
 from ..message import Message
@@ -138,5 +136,5 @@ def __init__(self, bus_name: str, path: str, introspection: Union[intr.Node, str
     def get_interface(self, name: str) -> ProxyInterface:
         return super().get_interface(name)
 
-    def get_children(self) -> List[ProxyObject]:
+    def get_children(self) -> List['ProxyObject']:
         return super().get_children()

dbus_next/errors.py

@@ -1,6 +1,3 @@
-from __future__ import annotations
-
-
 class SignatureBodyMismatchError(ValueError):
     pass
 

dbus_next/glib/message_bus.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from .._private.unmarshaller import Unmarshaller
 from ..constants import BusType
 from ..message import Message
@@ -150,7 +148,7 @@ def __init__(self, bus_address: str = None, bus_type: BusType = BusType.SESSION)
         super().__init__(bus_address, bus_type, ProxyObject)
         self._main_context = GLib.main_context_default()
 
-    def connect(self, connect_notify: Callable[[MessageBus, Optional[Exception]], None] = None):
+    def connect(self, connect_notify: Callable[['MessageBus', Optional[Exception]], None] = None):
         """Connect this message bus to the DBus daemon.
 
         This method or the synchronous version must be called before the
@@ -225,7 +223,7 @@ def on_match_added(reply, err):
 
         self._auth_readline(on_authline)
 
-    def connect_sync(self) -> MessageBus:
+    def connect_sync(self) -> 'MessageBus':
         """Connect this message bus to the DBus daemon.
 
         This method or the asynchronous version must be called before the

dbus_next/glib/proxy_object.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from ..proxy_object import BaseProxyObject, BaseProxyInterface
 from ..message_bus import BaseMessageBus
 from ..message import Message
@@ -280,5 +278,5 @@ def __init__(self, bus_name: str, path: str, introspection: Union[intr.Node, str
     def get_interface(self, name: str) -> ProxyInterface:
         return super().get_interface(name)
 
-    def get_children(self) -> List[ProxyObject]:
+    def get_children(self) -> List['ProxyObject']:
         return super().get_children()

dbus_next/introspection.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from .constants import PropertyAccess, ArgDirection
 from .signature import SignatureTree, SignatureType
 from .validators import assert_member_name_valid, assert_interface_name_valid
@@ -54,7 +52,7 @@ def __init__(self,
         self.name = name
         self.direction = direction
 
-    def from_xml(element: ET.Element, direction: ArgDirection) -> Arg:
+    def from_xml(element: ET.Element, direction: ArgDirection) -> 'Arg':
         """Convert a :class:`xml.etree.ElementTree.Element` into a
         :class:`Arg`.
 
@@ -177,7 +175,7 @@ def __init__(self, name: str, in_args: List[Arg] = [], out_args: List[Arg] = [])
         self.in_signature = ''.join(arg.signature for arg in in_args)
         self.out_signature = ''.join(arg.signature for arg in out_args)
 
-    def from_xml(element: ET.Element) -> Method:
+    def from_xml(element: ET.Element) -> 'Method':
         """Convert an :class:`xml.etree.ElementTree.Element` to a :class:`Method`.
 
         The element must be valid DBus introspection XML for a ``method``.
@@ -319,7 +317,7 @@ def __init__(self,
         self.properties = properties if properties is not None else []
 
     @staticmethod
-    def from_xml(element: ET.Element) -> Interface:
+    def from_xml(element: ET.Element) -> 'Interface':
         """Convert a :class:`xml.etree.ElementTree.Element` into a
         :class:`Interface`.
 
@@ -424,7 +422,7 @@ def from_xml(element: ET.Element, is_root: bool = False):
         return node
 
     @staticmethod
-    def parse(data: str) -> Node:
+    def parse(data: str) -> 'Node':
         """Parse XML data as a string into a :class:`Node`.
 
         The string must be valid DBus introspection XML.
@@ -482,7 +480,7 @@ def indent(elem, level=0):
         return header + ET.tostring(xml, encoding='unicode').rstrip()
 
     @staticmethod
-    def default(name: str = None) -> Node:
+    def default(name: str = None) -> 'Node':
         """Create a :class:`Node` with the default interfaces supported by this library.
 
         The default interfaces include:

dbus_next/message.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from ._private.marshaller import Marshaller
 from .constants import MessageType, MessageFlag, ErrorType
 from ._private.constants import PROTOCOL_VERSION, HeaderField, LITTLE_ENDIAN
@@ -115,7 +113,7 @@ def require_fields(*fields):
             raise InvalidMessageError(f'got unknown message type: {self.message_type}')
 
     @staticmethod
-    def new_error(msg: Message, error_name: str, error_text: str) -> Message:
+    def new_error(msg: 'Message', error_name: str, error_text: str) -> 'Message':
         """A convenience constructor to create an error message in reply to the given message.
 
         :param msg: The message this error is in reply to.
@@ -138,7 +136,7 @@ def new_error(msg: Message, error_name: str, error_text: str) -> Message:
                        body=[error_text])
 
     @staticmethod
-    def new_method_return(msg: Message, signature: str = '', body: List[Any] = []) -> Message:
+    def new_method_return(msg: 'Message', signature: str = '', body: List[Any] = []) -> 'Message':
         """A convenience constructor to create a method return to the given method call message.
 
         :param msg: The method call message this is a reply to.
@@ -165,7 +163,7 @@ def new_signal(path: str,
                    interface: str,
                    member: str,
                    signature: str = '',
-                   body: List[Any] = None) -> Message:
+                   body: List[Any] = None) -> 'Message':
         """A convenience constructor to create a new signal message.
 
         :param path: The path of this signal.

dbus_next/message_bus.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from ._private.address import get_bus_address, parse_address
 from .message import Message
 from .constants import BusType, MessageFlag, MessageType, ErrorType, NameFlag, RequestNameReply, ReleaseNameReply

dbus_next/proxy_object.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from .validators import assert_object_path_valid, assert_bus_name_valid
 from . import message_bus
 from .message import Message
@@ -108,7 +106,7 @@ class BaseProxyObject:
     """
 
     def __init__(self, bus_name: str, path: str, introspection: Union[intr.Node, str, ET.Element],
-                 bus: message_bus.BaseMessageBus, ProxyInterface: Type[BaseProxyInterface]):
+                 bus: 'message_bus.BaseMessageBus', ProxyInterface: Type[BaseProxyInterface]):
         assert_object_path_valid(path)
         assert_bus_name_valid(bus_name)
 
@@ -222,7 +220,7 @@ def message_handler(msg):
         self._interfaces[name] = interface
         return interface
 
-    def get_children(self) -> List[BaseProxyObject]:
+    def get_children(self) -> List['BaseProxyObject']:
         """Get the child nodes of this proxy object according to the introspection data."""
         if self._children is None:
             self._children = [

dbus_next/service.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from .constants import PropertyAccess
 from .signature import SignatureTree, SignatureBodyMismatchError, Variant
 from . import introspection as intr