[core] removed imports of deprecated typing aliases

A bunch of types in the typing module are deprecated since 3.9 and due for possible removal after the release of 3.14 (e.g. Iterable, Generator, Callable). Imports were updated to point to the new types in collections.abc to future proof the code.

Author: MrClock8163

src/geocompy/communication.py

@@ -27,7 +27,7 @@
 
 import logging
 from types import TracebackType
-from typing import Generator
+from collections.abc import Generator
 from contextlib import contextmanager
 from abc import ABC, abstractmethod
 from time import sleep

src/geocompy/data.py

@@ -30,13 +30,15 @@
 from enum import Enum
 from typing import (
     Literal,
-    Callable,
-    Iterator,
     TypeVar,
     Self,
     Any,
     SupportsFloat
 )
+from collections.abc import (
+    Callable,
+    Iterator
+)
 
 
 RO = 180 * 60 * 60 / math.pi

src/geocompy/geo/__init__.py

@@ -41,7 +41,8 @@
 from traceback import format_exc
 from time import sleep
 from enum import Enum
-from typing import Any, Callable, Iterable, overload, TypeVar
+from typing import Any, overload, TypeVar
+from collections.abc import Callable, Iterable
 
 from serial import SerialException, SerialTimeoutException
 

src/geocompy/geo/gctypes.py

@@ -18,7 +18,8 @@
 from __future__ import annotations
 
 from enum import IntEnum, Enum
-from typing import TypeVar, Any, Generic, Callable, Iterable, overload
+from typing import TypeVar, Any, Generic, overload
+from collections.abc import Callable, Iterable
 from abc import ABC, abstractmethod
 
 from ..data import Angle, Byte

src/geocompy/gsi/dna/__init__.py

@@ -22,7 +22,8 @@
 
 from enum import IntEnum
 import re
-from typing import Callable, TypeVar
+from typing import TypeVar
+from collections.abc import Callable
 from traceback import format_exc
 from logging import Logger
 from time import sleep

src/geocompy/gsi/gsiformat.py

@@ -28,6 +28,8 @@
     Self,
     TypeVar,
     TextIO,
+)
+from collections.abc import (
     Iterator,
     Iterable,
     Generator
@@ -2259,7 +2261,7 @@ def get_word(self, wordtype: type[_T]) -> _T | None:
             Return None if the block does not contain a word of the requested
             type.
         """
-        return cast(_T, self._words.get(wordtype.WI()))
+        return cast(_T | None, self._words.get(wordtype.WI()))
 
     def serialize(
         self,

src/geocompy/gsi/gsitypes.py

@@ -17,7 +17,8 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TypeVar, Generic, Callable, Literal
+from typing import TypeVar, Generic, Literal
+from collections.abc import Callable
 
 from .gsiformat import GsiWord
 

tests/test_geocom.py

@@ -1,4 +1,5 @@
-from typing import Callable, Any, Iterable
+from typing import Any
+from collections.abc import Callable, Iterable
 import re
 
 import pytest