Updated code to Python 3.11

pytcp/__init__.py

@@ -37,7 +37,6 @@
 import os
 import struct
 import sys
-from typing import Tuple
 
 from pytcp import config
 from pytcp.lib import stack
@@ -51,7 +50,7 @@
 IFF_NO_PI = 0x1000
 
 
-def initialize_tap(*, tap_name: str) -> Tuple[int, int]:
+def initialize_tap(*, tap_name: str) -> tuple[int, int]:
     """
     Initialize the TAP interface.
     """
@@ -80,7 +79,7 @@ class TcpIpStack:
     def __init__(
         self,
         *,
-        fd: Tuple[int, int],
+        fd: tuple[int, int],
         mac_address: str | None = None,
         ip4_address: str | None = None,
         ip4_gateway: str | None = None,

pytcp/protocols/tcp/session.py

@@ -46,8 +46,9 @@
 
 import random
 import threading
+from collections.abc import Callable
 from enum import Enum, auto
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from pytcp import config
 from pytcp.lib import stack

pytcp/subsystems/rx_ring.py

@@ -41,7 +41,7 @@
 import select
 import threading
 import time
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from pytcp.lib.logger import log
 from pytcp.lib.packet import PacketRx
@@ -107,7 +107,7 @@ def __thread_receive(self) -> None:
 
         __debug__ and log("stack", "Stopped RX ring")
 
-    def dequeue(self) -> Optional[PacketRx]:
+    def dequeue(self) -> PacketRx | None:
         """
         Dequeue inboutd frame from RX ring.
         """

pytcp/subsystems/timer.py

@@ -40,7 +40,8 @@
 
 import threading
 import time
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 from pytcp.lib.logger import log
 

requirements_dev.txt

@@ -10,3 +10,4 @@ pyre-check
 build
 twine
 ipython
+pyupgrade