refactor: make use of Python 3.9 where list, set and dict are now subscriptable

Author: ntamas

poetry.lock

@@ -15,7 +15,7 @@ pytest = "^7.2.1"
 pytest-cov = "^4.0.0"
 richbench = "^1.0.3"
 igraph = "^0.10.6"
-stimulus = { git = "https://github.com/igraph/stimulus.git", tag = "0.14.0" }
+stimulus = { git = "https://github.com/igraph/stimulus.git", tag = "0.14.1" }
 
 [tool.poetry-dynamic-versioning]
 enable = true

pyproject.toml

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from ctypes import c_char_p, c_int
-from typing import Any, Iterable, List, Optional, Tuple, TYPE_CHECKING
+from typing import Any, Iterable, Optional, TYPE_CHECKING
 
 from .conversion import *  # noqa
 from .enums import *  # noqa

src/codegen/internal_functions.py.in

@@ -3,13 +3,10 @@
 from pathlib import Path
 from typing import (
     Callable,
-    Dict,
     Iterable,
-    List,
     Optional,
     Sequence,
     TextIO,
-    Tuple,
     Union,
 )
 
@@ -140,7 +137,7 @@ def generate_enums(  # noqa: C901
         "VitType": "VertexIteratorType",
         "VsType": "VertexSequenceType",
     }
-    EXTRA_ENUM_MEMBERS: Dict[str, Sequence[Tuple[str, int]]] = {
+    EXTRA_ENUM_MEMBERS: dict[str, Sequence[tuple[str, int]]] = {
         "Loops": [("IGNORE", 0)]
     }
 
@@ -219,7 +216,7 @@ def process_enum(fp: TextIO, spec) -> Optional[str]:  # noqa: C901
         fp.write("\n\n")
         return name
 
-    def process_file(outfp: TextIO, infp: TextIO) -> List[str]:
+    def process_file(outfp: TextIO, infp: TextIO) -> list[str]:
         all_names = []
 
         current_enum, in_enum = [], False

src/codegen/run.py

@@ -129,7 +129,7 @@ VERTEX_INDICES:
 
 VERTEX_INDICES_LIST:
   PY_TYPE: Iterable[Iterable[VertexLike]]
-  PY_RETURN_TYPE: List[IntArray]
+  PY_RETURN_TYPE: list[IntArray]
   INCONV:
     IN: "%C% = iterable_of_vertex_index_iterable_to_igraph_vector_int_list_t(%I%)"
     OUT: "%C% = _VectorIntList.create(0)"
@@ -184,7 +184,7 @@ EDGE_INDICES:
 
 EDGE_INDICES_LIST:
   PY_TYPE: Iterable[Iterable[EdgeLike]]
-  PY_RETURN_TYPE: List[IntArray]
+  PY_RETURN_TYPE: list[IntArray]
   INCONV:
     IN: "%C% = iterable_of_edge_index_iterable_to_igraph_vector_int_list_t(%I%)"
     OUT: "%C% = _VectorIntList.create(0)"

src/codegen/types.yaml

@@ -4,7 +4,7 @@
     py_object,
 )
 from dataclasses import dataclass, field
-from typing import Any, Callable, Dict, Optional
+from typing import Any, Callable, Optional
 
 from .lib import igraph_error, igraph_vector_ptr_size
 from .refcount import incref, decref
@@ -34,7 +34,7 @@ class AttributeHandlerBase:
     _table: Optional[igraph_attribute_table_t] = None
     _table_ptr = None
 
-    def _get_attribute_handler_functions(self) -> Dict[str, Callable]:
+    def _get_attribute_handler_functions(self) -> dict[str, Callable]:
         """Returns an ``igraph_attribute_table_t`` instance that can be used
         to register this attribute handler in the core igraph library.
         """
@@ -60,7 +60,7 @@ class AttributeStorage(ABC):
     """
 
     @abstractmethod
-    def add_vertices(self, n: int) -> None:
+    def add_vertices(self, graph, n: int) -> None:
         """Notifies the attribute storage object that the given number of
         new vertices were added to the graph.
         """
@@ -82,17 +82,17 @@ def copy(
 
 
 @dataclass(frozen=True)
-class DictAttributeStorage(AttributeStorage):
-    """Dictionary-based storage area for the graph, vertex and edge attributes
+class dictAttributeStorage(AttributeStorage):
+    """dictionary-based storage area for the graph, vertex and edge attributes
     of a graph.
     """
 
-    graph_attributes: Dict[str, Any] = field(default_factory=dict)
-    vertex_attributes: Dict[str, Any] = field(default_factory=dict)
-    edge_attributes: Dict[str, Any] = field(default_factory=dict)
+    graph_attributes: dict[str, Any] = field(default_factory=dict)
+    vertex_attributes: dict[str, list] = field(default_factory=dict)
+    edge_attributes: dict[str, Any] = field(default_factory=dict)
 
     def add_vertices(self, graph, n: int) -> None:
-        print("Added", n, "vertices")
+        pass
 
     def clear(self) -> None:
         """Clears the storage area, removing all attributes from the
@@ -148,12 +148,12 @@ def _detach_storage_from_graph(graph) -> None:
 
 
 class AttributeHandler(AttributeHandlerBase):
-    """Attribute handler implementation that uses a DictAttributeStorage_
+    """Attribute handler implementation that uses a dictAttributeStorage_
     as its storage backend.
     """
 
     def init(self, graph, attr):
-        _assign_storage_to_graph(graph, DictAttributeStorage())
+        _assign_storage_to_graph(graph, dictAttributeStorage())
 
     def destroy(self, graph) -> None:
         storage = _get_storage_from_graph(graph)

src/igraph_ctypes/_internal/attributes.py

@@ -5,7 +5,7 @@
 import numpy as np
 
 from ctypes import memmove, POINTER
-from typing import Any, Iterable, List, Optional, Sequence, TYPE_CHECKING
+from typing import Any, Iterable, Optional, Sequence, TYPE_CHECKING
 
 from .enums import MatrixStorage
 from .lib import (
@@ -659,17 +659,17 @@ def vertex_qtys_to_igraph_vector_t_view(
 ################################################################################
 
 
-def igraph_vector_t_to_list(vector: _Vector) -> List[float]:
+def igraph_vector_t_to_list(vector: _Vector) -> list[float]:
     n = igraph_vector_size(vector)
     return [float(igraph_vector_e(vector, i)) for i in range(n)]
 
 
-def igraph_vector_bool_t_to_list(vector: _VectorBool) -> List[bool]:
+def igraph_vector_bool_t_to_list(vector: _VectorBool) -> list[bool]:
     n = igraph_vector_bool_size(vector)
     return [bool(igraph_vector_bool_e(vector, i)) for i in range(n)]
 
 
-def igraph_vector_int_t_to_list(vector: _VectorInt) -> List[int]:
+def igraph_vector_int_t_to_list(vector: _VectorInt) -> list[int]:
     n = igraph_vector_int_size(vector)
     return [int(igraph_vector_int_e(vector, i)) for i in range(n)]
 
@@ -718,7 +718,7 @@ def igraph_vector_int_t_to_numpy_array(vector: _VectorInt) -> IntArray:
 
 def igraph_vector_list_t_to_list_of_numpy_array(
     vector_list: _VectorList,
-) -> List[RealArray]:
+) -> list[RealArray]:
     n = igraph_vector_list_size(vector_list)
     vec = _Vector()
     result = []
@@ -736,7 +736,7 @@ def igraph_vector_list_t_to_list_of_numpy_array(
 
 def igraph_vector_int_list_t_to_list_of_numpy_array(
     vector_list: _VectorIntList,
-) -> List[IntArray]:
+) -> list[IntArray]:
     n = igraph_vector_int_list_size(vector_list)
     vec = _VectorInt()
     result = []