fix circular import

Author: eternal-sorrow

i3ipc/_private/pubsub.py

@@ -1,11 +1,14 @@
-from typing import Callable, Optional, TypeAlias, TypedDict, TypeVar
+from typing import Callable, Optional, TypeAlias, TypedDict, TypeVar, TYPE_CHECKING
+
 
-from i3ipc.connection import Connection
 from i3ipc.events import IpcBaseEvent
 
+if TYPE_CHECKING:
+    from i3ipc.connection import Connection
+
 _BaseEvent = TypeVar('_BaseEvent', bound=IpcBaseEvent, contravariant=True)
 
-Handler: TypeAlias = Callable[[Connection, _BaseEvent], None]
+Handler: TypeAlias = Callable[['Connection', _BaseEvent], None]
 
 
 class Subscription(TypedDict):
@@ -15,7 +18,7 @@ class Subscription(TypedDict):
 
 
 class PubSub(object):
-    def __init__(self, conn: Connection):
+    def __init__(self, conn: 'Connection'):
         self.conn = conn
         self._subscriptions: list[Subscription] = []
 

i3ipc/con.py

@@ -1,10 +1,12 @@
 import re
 import sys
-from .connection import Connection
 from .model import Rect, Gaps
 from . import replies
 from collections import deque
-from typing import Any, cast, Generic, Literal, Optional, TypeVar
+from typing import Any, cast, Generic, Literal, Optional, TypeVar, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .connection import Connection
 
 _Con = TypeVar('_Con', bound='Con')
 
@@ -121,7 +123,7 @@ class Con(Generic[_Con]):
     representation: str
     visible: bool
 
-    def __init__(self: _Con, data: dict[str, Any], parent: _Con, conn: Connection):
+    def __init__(self: _Con, data: dict[str, Any], parent: _Con, conn: 'Connection'):
         self.ipc_data = data
         self._conn = conn
         self.parent = parent

i3ipc/events.py

@@ -1,7 +1,10 @@
-from . import con, connection
+from . import con
 from .replies import BarConfigReply, InputReply
 from enum import Enum
-from typing import Any, Optional
+from typing import Any, Optional, TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .connection import Connection
 
 
 class IpcBaseEvent:
@@ -66,7 +69,7 @@ class WorkspaceEvent(IpcBaseEvent):
     :ivar ipc_data: The raw data from the i3 ipc.
     :vartype ipc_data: dict
     """
-    def __init__(self, data: dict[str, Any], conn: connection.Connection, _Con=con.Con):
+    def __init__(self, data: dict[str, Any], conn: 'Connection', _Con=con.Con):
         self.ipc_data = data
         self.change: str = data['change']
         self.current: Optional[con.Con] = None
@@ -127,7 +130,7 @@ class WindowEvent(IpcBaseEvent):
     :ivar ipc_data: The raw data from the i3 ipc.
     :vartype ipc_data: dict
     """
-    def __init__(self, data: dict[str, Any], conn: connection.Connection, _Con=con.Con):
+    def __init__(self, data: dict[str, Any], conn: 'Connection', _Con=con.Con):
         self.ipc_data = data
         self.change: str = data['change']
         self.container = _Con(data['container'], None, conn)