Fix stubtest and type checker errors

Author: lagru

src/docstub-stubs/_doctype.pyi

@@ -7,7 +7,7 @@ from collections.abc import Generator, Iterable, Sequence
 from dataclasses import dataclass
 from pathlib import Path
 from textwrap import indent
-from typing import Any, Final, Self
+from typing import Any, ClassVar, Final, Self
 
 import lark
 import lark.visitors
@@ -16,14 +16,14 @@ from _typeshed import Incomplete
 from ._report import ContextReporter
 from ._utils import DocstubError
 
-logger: Final
+logger: Final[logging.Logger]
 
-grammar_path: Final
+grammar_path: Final[Path]
 
 with grammar_path.open() as file:
-    _grammar: Final
+    _grammar: Final[str]
 
-_lark: Final
+_lark: Final[lark.Lark]
 
 def flatten_recursive(iterable: Iterable[Iterable | str]) -> Generator[str]: ...
 def insert_between(iterable: Iterable, *, sep: Any) -> list[Any]: ...
@@ -35,12 +35,14 @@ class TermKind(enum.StrEnum):
     SYNTAX = enum.auto()
 
 class Term(str):
+    kind: TermKind
+    pos: tuple[int, int] | None
 
-    __slots__: Final
+    __slots__: Final[ClassVar[tuple[str, ...]]]
 
     def __new__(
         cls, value: str, *, kind: TermKind | str, pos: tuple[int, int] | None = ...
-    ) -> None: ...
+    ) -> Self: ...
     def __repr__(self) -> str: ...
     def __getnewargs_ex__(self) -> tuple[tuple[Any, ...], dict[str, Any]]: ...
 
@@ -63,7 +65,7 @@ class Expr:
     def __str__(self) -> str: ...
     def as_code(self) -> str: ...
 
-BLACKLISTED_QUALNAMES: Final
+BLACKLISTED_QUALNAMES: Final[set[str]]
 
 class BlacklistedQualname(DocstubError):
     pass

src/docstub/_doctype.py

@@ -15,17 +15,17 @@
 from ._report import ContextReporter
 from ._utils import DocstubError
 
-logger: Final = logging.getLogger(__name__)
+logger: Final[logging.Logger] = logging.getLogger(__name__)
 
 
-grammar_path: Final = Path(__file__).parent / "doctype.lark"
+grammar_path: Final[Path] = Path(__file__).parent / "doctype.lark"
 
 with grammar_path.open() as file:
-    _grammar: Final = file.read()
+    _grammar: Final[str] = file.read()
 
 # TODO try passing `transformer=DoctypeTransformer()`, may be faster [1]
 # [1] https://lark-parser.readthedocs.io/en/latest/classes.html#:~:text=after%20the%20parse%2C-,but%20faster,-)
-_lark: Final = lark.Lark(_grammar, propagate_positions=True)
+_lark: Final[lark.Lark] = lark.Lark(_grammar, propagate_positions=True)
 
 
 def flatten_recursive(iterable):
@@ -80,10 +80,12 @@ class Term(str):
 
     Attributes
     ----------
-    __slots__ : Final
+    kind : TermKind
+    pos : tuple of (int, int) or None
+    __slots__ : Final[ClassVar[tuple[str, ...]]]
     """
 
-    __slots__ = ("kind", "pos", "value")
+    __slots__ = ("kind", "pos")
 
     def __new__(cls, value, *, kind, pos=None):
         """
@@ -92,6 +94,10 @@ def __new__(cls, value, *, kind, pos=None):
         value : str
         kind : TermKind or str
         pos : tuple of (int, int), optional
+
+        Returns
+        -------
+        cls : Self
         """
         self = super().__new__(cls, value)
         self.kind = TermKind(kind)
@@ -201,7 +207,7 @@ def as_code(self) -> str:
         return str(self)
 
 
-BLACKLISTED_QUALNAMES: Final = set(keyword.kwlist) - {"None", "True", "False"}
+BLACKLISTED_QUALNAMES: Final[set[str]] = set(keyword.kwlist) - {"None", "True", "False"}
 
 
 class BlacklistedQualname(DocstubError):

stubtest_allow.txt

@@ -1,3 +1,4 @@
 docstub\._version\..*
 docstub._cache.FuncSerializer.__type_params__
+docstub._doctype.TermKind..*
 (docstub\..*__conditional_annotations__)?