Replace typing.ContextManager with contextlib.AbstractContextManager

The former has been deprecated since Python 3.9.

Author: pmderodat

langkit/compile_context.py

@@ -12,14 +12,14 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from contextlib import contextmanager
+from contextlib import AbstractContextManager, contextmanager
 from enum import Enum
 from functools import reduce
 import importlib
 import os
 from os import path
-from typing import (Any, Callable, ContextManager, Dict, List, Optional, Set,
-                    TYPE_CHECKING, Tuple, Union, cast)
+from typing import (Any, Callable, Dict, List, Optional, Set, TYPE_CHECKING,
+                    Tuple, Union, cast)
 
 from funcy import lzip
 
@@ -852,7 +852,7 @@ def actual_version(self) -> str:
     def actual_build_date(self) -> str:
         return self.build_date or "undefined"
 
-    def lkt_context(self, lkt_node: L.LktNode) -> ContextManager[None]:
+    def lkt_context(self, lkt_node: L.LktNode) -> AbstractContextManager[None]:
         """
         Context manager to set the diagnostic context to the given node.
 

langkit/compiled_types.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
 from collections import OrderedDict
+from contextlib import AbstractContextManager
 from dataclasses import dataclass
 import difflib
 from itertools import count, takewhile
 import pipes
 from typing import (
-    Callable, ClassVar, ContextManager, Dict, Iterator, List, Optional as Opt,
-    Sequence, Set, TYPE_CHECKING, Tuple, Union, ValuesView
+    Callable, ClassVar, Dict, Iterator, List, Optional as Opt, Sequence, Set,
+    TYPE_CHECKING, Tuple, Union, ValuesView
 )
 
 from langkit import names
@@ -381,7 +382,7 @@ def uses_entity_info(self) -> bool:
         return self._uses_entity_info
 
     @property
-    def diagnostic_context(self) -> ContextManager[None]:
+    def diagnostic_context(self) -> AbstractContextManager[None]:
         return diagnostic_context(self.location)
 
     @property

langkit/dsl.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+from contextlib import AbstractContextManager
 import itertools
 from typing import (
-    Any, ContextManager, Dict, List, Optional as Opt, TYPE_CHECKING, Tuple,
-    Type, Union
+    Any, Dict, List, Optional as Opt, TYPE_CHECKING, Tuple, Type, Union
 )
 
 from langkit.compiled_types import (
@@ -49,7 +49,7 @@ def array(cls):
                        '{}.array'.format(cls._name.camel))
 
     @classmethod
-    def _diagnostic_context(cls) -> ContextManager[None]:
+    def _diagnostic_context(cls) -> AbstractContextManager[None]:
         return diagnostic_context(cls._location)
 
     @staticmethod

langkit/envs.py

@@ -8,10 +8,11 @@
 
 from __future__ import annotations
 
+from contextlib import AbstractContextManager
 from enum import Enum
 from funcy import lsplit_by
 from itertools import count
-from typing import ContextManager, Dict, List, Optional, Type, cast, overload
+from typing import Dict, List, Optional, Type, cast, overload
 
 from langkit import names
 from langkit.compile_context import CompileCtx, get_context
@@ -252,7 +253,7 @@ def count(cls: Type[EnvAction], sequence: List[EnvAction]) -> int:
         self.actions = self.pre_actions + self.post_actions
 
     @property
-    def diagnostic_context(self) -> ContextManager[None]:
+    def diagnostic_context(self) -> AbstractContextManager[None]:
         """
         Diagnostic context for env specs.
         """

langkit/expressions/structs.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+from contextlib import AbstractContextManager
 import inspect
-from typing import (Any as _Any, ContextManager, Dict, List, Optional,
-                    Sequence, Tuple)
+from typing import Any as _Any, Dict, List, Optional, Sequence, Tuple
 
 import funcy
 
@@ -861,7 +861,7 @@ def __init__(self,
         self.node_data: AbstractNodeData
 
     @property
-    def diagnostic_context(self) -> ContextManager[None]:
+    def diagnostic_context(self) -> AbstractContextManager[None]:
         return diagnostic_context(self.location)
 
     def resolve_field(self) -> AbstractNodeData:

langkit/lexer/__init__.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
 from collections import defaultdict
+from contextlib import AbstractContextManager
 from itertools import count
 import re
-from typing import (Any, ContextManager, Dict, Iterator, List, Optional,
-                    Sequence, Set, TYPE_CHECKING, Tuple, Type, Union, cast)
+from typing import (Any, Dict, Iterator, List, Optional, Sequence, Set,
+                    TYPE_CHECKING, Tuple, Type, Union, cast)
 
 from langkit.compile_context import CompileCtx, get_context
 from langkit.diagnostics import (
@@ -321,7 +322,7 @@ def signature(self) -> tuple:
                 sorted(t.signature for t in self.tokens))
 
     @property
-    def diagnostic_context(self) -> ContextManager[None]:
+    def diagnostic_context(self) -> AbstractContextManager[None]:
         assert self.location is not None
         return diagnostic_context(self.location)
 

langkit/parsers.py

@@ -23,14 +23,14 @@
 from __future__ import annotations
 
 from collections import OrderedDict
-from contextlib import contextmanager
+from contextlib import AbstractContextManager, contextmanager
 import difflib
 from funcy import keep
 import inspect
 from itertools import count
 from typing import (
-    Any, Callable, ContextManager, Dict, Iterator, List as _List, Optional,
-    Sequence, Set, TYPE_CHECKING, Tuple, Type, Union
+    Any, Callable, Dict, Iterator, List as _List, Optional, Sequence, Set,
+    TYPE_CHECKING, Tuple, Type, Union
 )
 
 import funcy
@@ -270,7 +270,7 @@ def __init__(self,
         If we loaded a Lkt unit, mapping of all grammar rules it contains.
         """
 
-    def context(self) -> ContextManager[None]:
+    def context(self) -> AbstractContextManager[None]:
         return diagnostic_context(self.location)
 
     def _add_rule(self, name: str, parser: Parser, doc: str = "") -> None:
@@ -762,7 +762,7 @@ def set_location(self, location: Location) -> None:
             c.set_location(self.location)
 
     @property
-    def diagnostic_context(self) -> ContextManager[None]:
+    def diagnostic_context(self) -> AbstractContextManager[None]:
         """
         Helper that will return a diagnostic context manager with parameters
         set for the grammar definition.