Handle some lint issues related to typing imports (#274)

snitun/client/connector.py

@@ -2,10 +2,11 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Coroutine
 from contextlib import suppress
 import ipaddress
 import logging
-from typing import Any, Coroutine
+from typing import Any
 
 from ..exceptions import MultiplexerTransportClose, MultiplexerTransportError
 from ..multiplexer.channel import MultiplexerChannel

snitun/server/peer.py

@@ -2,11 +2,11 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Coroutine
 from datetime import datetime, timezone
 import hashlib
 import logging
 import os
-from typing import Coroutine
 
 import async_timeout
 

snitun/server/peer_manager.py

@@ -3,11 +3,11 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Callable
 from datetime import datetime, timezone
 from enum import Enum
 import json
 import logging
-from typing import Callable
 
 import async_timeout
 from cryptography.fernet import Fernet, InvalidToken, MultiFernet

snitun/server/run.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Awaitable, Iterable
 from contextlib import suppress
 from itertools import cycle
 import logging
@@ -12,7 +13,6 @@
 import signal
 import socket
 from threading import Thread
-from typing import Awaitable, Iterable
 
 import async_timeout
 import attr

snitun/server/sni.py

@@ -6,7 +6,7 @@
 import logging
 
 from ..exceptions import ParseSNIError, ParseSNIIncompleteError
-from ..utils.server import MAX_READ_SIZE, MAX_BUFFER_SIZE
+from ..utils.server import MAX_BUFFER_SIZE, MAX_READ_SIZE
 
 _LOGGER = logging.getLogger(__name__)
 

snitun/utils/aiohttp_client.py

@@ -2,11 +2,12 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Coroutine
 from contextlib import suppress
 import logging
 import socket
 import ssl
-from typing import Any, Coroutine
+from typing import Any
 
 from aiohttp.web import AppRunner, SockSite
 import async_timeout