pytest-revealtype-injector 0.2.2__tar.gz → 0.2.3__tar.gz

{pytest_revealtype_injector-0.2.2 → pytest_revealtype_injector-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-revealtype-injector
-Version: 0.2.2
+Version: 0.2.3
 Summary: Pytest plugin for replacing reveal_type() calls inside test functions with static and runtime type checking result comparison, for confirming type annotation validity.
 Project-URL: homepage, https://github.com/abelcheung/pytest-revealtype-injector
 Author-email: Abel Cheung <abelcheung@gmail.com>

{pytest_revealtype_injector-0.2.2 → pytest_revealtype_injector-0.2.3}/pyproject.toml

@@ -139,3 +139,5 @@ exclude_commit_patterns = [
     '^Merge pull request #\d+ from',
     '^(build|ci|style)(\(.+?\))?: ',
 ]
+mode = "update"
+insertion_flag = "<!-- insertion placeholder -->"

{pytest_revealtype_injector-0.2.2 → pytest_revealtype_injector-0.2.3}/src/pytest_revealtype_injector/__init__.py

@@ -1,3 +1,3 @@
 """Pytest plugin for replacing reveal_type() calls inside test functions with static and runtime type checking result comparison, for confirming type annotation validity."""  # noqa: E501
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"

{pytest_revealtype_injector-0.2.2 → pytest_revealtype_injector-0.2.3}/src/pytest_revealtype_injector/adapter/pyright_.py

@@ -12,6 +12,7 @@ from typing import (
     ForwardRef,
     Literal,
     TypedDict,
+    TypeVar,
     cast,
 )
 
@@ -34,10 +35,12 @@ class _PyrightDiagPosition(TypedDict):
     line: int
     character: int
 
+
 class _PyrightDiagRange(TypedDict):
     start: _PyrightDiagPosition
     end: _PyrightDiagPosition
 
+
 class _PyrightDiagItem(TypedDict):
     file: str
     severity: Literal["information", "warning", "error"]
@@ -46,6 +49,13 @@ class _PyrightDiagItem(TypedDict):
 
 
 class _NameCollector(NameCollectorBase):
+    # Pre-register common used bare names from typing
+    collected = NameCollectorBase.collected | {
+        k: v
+        for k, v in NameCollectorBase.collected["typing"].__dict__.items()
+        if k[0].isupper() and not isinstance(v, TypeVar)
+    }
+
     # Pyright inferred type results always contain bare names only,
     # so don't need to bother with visit_Attribute()
     def visit_Name(self, node: ast.Name) -> ast.Name:

{pytest_revealtype_injector-0.2.2 → pytest_revealtype_injector-0.2.3}/src/pytest_revealtype_injector/main.py

@@ -126,17 +126,15 @@ def revealtype_injector(var: _T) -> _T:
             adp.typechecker_result[pos] = VarType(var_name, tc_result.type)
 
         ref = tc_result.type
+        walker = adp.create_collector(globalns, localns)
         try:
-            _ = eval(ref.__forward_arg__, globalns, localns)
+            _ = eval(ref.__forward_arg__, globalns, localns | walker.collected)
         except (TypeError, NameError):
             ref_ast = ast.parse(ref.__forward_arg__, mode="eval")
-            walker = adp.create_collector(globalns, localns)
             new_ast = walker.visit(ref_ast)
             if walker.modified:
                 ref = ForwardRef(ast.unparse(new_ast))
-            memo = TypeCheckMemo(globalns, localns | walker.collected)
-        else:
-            memo = TypeCheckMemo(globalns, localns)
+        memo = TypeCheckMemo(globalns, localns | walker.collected)
 
         try:
             check_type_internal(var, ref, memo)

{pytest_revealtype_injector-0.2.2 → pytest_revealtype_injector-0.2.3}/src/pytest_revealtype_injector/models.py

@@ -47,6 +47,12 @@ class TypeCheckerError(Exception):
 
 
 class NameCollectorBase(ast.NodeTransformer):
+    # typing_extensions guaranteed to be present,
+    # as a dependency of typeguard
+    collected: dict[str, Any] = {
+        m: importlib.import_module(m)
+        for m in ("builtins", "typing", "typing_extensions")
+    }
     def __init__(
         self,
         globalns: dict[str, Any],
@@ -56,12 +62,7 @@ class NameCollectorBase(ast.NodeTransformer):
         self._globalns = globalns
         self._localns = localns
         self.modified: bool = False
-        # typing_extensions guaranteed to be present,
-        # as a dependency of typeguard
-        self.collected: dict[str, Any] = {
-            m: importlib.import_module(m)
-            for m in ("builtins", "typing", "typing_extensions")
-        }
+        self.collected = type(self).collected.copy()
 
     def visit_Subscript(self, node: ast.Subscript) -> ast.expr:
         node.value = cast("ast.expr", self.visit(node.value))