pytest-revealtype-injector 0.6.1__py3-none-any.whl → 0.6.3__py3-none-any.whl

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.6.1"
+__version__ = "0.6.3"

pytest_revealtype_injector/adapter/mypy_.py

@@ -136,6 +136,25 @@ class NameCollector(NameCollectorBase):
         return node
 
 
+# Mypy can insert extra character into expression so that it
+# becomes invalid and unparsable. 0.9x days there
+# was '*', and now '?' (and '=' for typeddict too).
+# Instead of globally throwing them away (and causing
+# literal string constants to not match), we iteratively
+# remove chars one by one only where parsing error occurs.
+#
+def _strip_unwanted_char(input: str) -> str:
+    result = input
+    while True:
+        try:
+            _ = ast.parse(result)
+        except SyntaxError as e:
+            assert e.offset is not None
+            result = result[:e.offset-1] + result[e.offset:]
+        else:
+            return result
+
+
 class MypyAdapter(TypeCheckerAdapter):
     id = "mypy"
     _executable = ""  # unused, calls mypy.api.run() here
@@ -212,12 +231,7 @@ class MypyAdapter(TypeCheckerAdapter):
                 )
             if (m := self._type_mesg_re.fullmatch(diag["message"])) is None:
                 continue
-            # Mypy can insert extra character into expression so that it
-            # becomes invalid and unparsable. 0.9x days there
-            # was '*', and now '?' (and '=' for typeddict too).
-            # Try stripping those character and pray we get something
-            # usable for evaluation
-            expression = m["type"].translate({ord(c): None for c in "*?="})
+            expression = _strip_unwanted_char(m["type"])
             try:
                 # Unlike pyright, mypy output doesn't contain variable name
                 self.typechecker_result[pos] = VarType(None, ForwardRef(expression))

pytest_revealtype_injector/hooks.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import functools
 import inspect
+from collections.abc import Iterator
 from typing import cast
 
 import pytest
@@ -14,7 +15,8 @@ _logger = log.get_logger()
 adapter_stash_key: pytest.StashKey[set[TypeCheckerAdapter]]
 
 
-def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> None:
+@pytest.hookimpl(wrapper=True)
+def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> Iterator[None]:
     assert pyfuncitem.module is not None
     adp_stash = pyfuncitem.config.stash[adapter_stash_key]
 
@@ -23,7 +25,7 @@ def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> None:
     if mark:
         disabled_adapters = {a.id for a in adp_stash if a.id in mark.args}
         for a in disabled_adapters:
-            _logger.info(f"{a} adapter disabled by 'notypechecker' marker")
+            _logger.info(f"{a} adapter disabled by 'notypechecker' marker in {pyfuncitem.name} test")
         adapters = {a for a in adp_stash if a.id not in disabled_adapters}
     else:
         adapters = {a for a in adp_stash}
@@ -31,39 +33,43 @@ def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> None:
     if not adapters:
         pytest.fail("All type checkers have been disabled.")
 
-    # Replace reveal_type() with our own function
-    for name in dir(pyfuncitem.module):
-        if name.startswith("__") or name.startswith("@py"):
-            continue
-
-        item = getattr(pyfuncitem.module, name)
-        if inspect.isfunction(item):
-            if item.__name__ != "reveal_type" or item.__module__ not in {
-                "typing",
-                "typing_extensions",
-            }:
+    # Monkeypatch reveal_type() with our own function, to guarantee
+    # each test func can receive different adapters
+    with pytest.MonkeyPatch.context() as mp:
+        for name in dir(pyfuncitem.module):
+            if name.startswith("__") or name.startswith("@py"):
                 continue
-            injected = functools.partial(
-                revealtype_injector,
-                adapters=adapters,
-                rt_funcname=name,
-            )
-            setattr(pyfuncitem.module, name, injected)
-            _logger.info(f"Replaced {name}() from global import with {injected}")
-            break
 
-        elif inspect.ismodule(item):
-            if item.__name__ not in {"typing", "typing_extensions"}:
-                continue
-            assert hasattr(item, "reveal_type")
-            injected = functools.partial(
-                revealtype_injector,
-                adapters=adapters,
-                rt_funcname=f"{name}.reveal_type",
-            )
-            setattr(item, "reveal_type", injected)
-            _logger.info(f"Replaced {name}.reveal_type() with {injected}")
-            break
+            item = getattr(pyfuncitem.module, name)
+            if inspect.isfunction(item):
+                if item.__name__ != "reveal_type" or item.__module__ not in {
+                    "typing",
+                    "typing_extensions",
+                }:
+                    continue
+                injected = functools.partial(
+                    revealtype_injector,
+                    adapters=adapters,
+                    rt_funcname=name,
+                )
+                mp.setattr(pyfuncitem.module, name, injected)
+                _logger.info(f"Replaced {name}() from global import with {injected} in {pyfuncitem.name} test")
+                break
+
+            elif inspect.ismodule(item):
+                if item.__name__ not in {"typing", "typing_extensions"}:
+                    continue
+                assert hasattr(item, "reveal_type")
+                injected = functools.partial(
+                    revealtype_injector,
+                    adapters=adapters,
+                    rt_funcname=f"{name}.reveal_type",
+                )
+                mp.setattr(item, "reveal_type", injected)
+                _logger.info(f"Replaced {name}.reveal_type() with {injected} in {pyfuncitem.name} test")
+                break
+
+        return cast(None, (yield))  # type: ignore[redundant-cast]
 
 
 def pytest_collection_finish(session: pytest.Session) -> None:

{pytest_revealtype_injector-0.6.1.dist-info → pytest_revealtype_injector-0.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-revealtype-injector
-Version: 0.6.1
+Version: 0.6.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>
@@ -22,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Testing
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
-Requires-Dist: pytest<9,>=7.0
-Requires-Dist: schema==0.7.7
+Requires-Dist: pytest>=7.0
+Requires-Dist: schema>=0.7.8
 Requires-Dist: typeguard>=4.3
 Requires-Dist: typing-extensions>=4.0; python_version < '3.11'
 Description-Content-Type: text/markdown

{pytest_revealtype_injector-0.6.1.dist-info → pytest_revealtype_injector-0.6.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytest_revealtype_injector/__init__.py,sha256=wu2hLHVkWsPCsABHczD0U9APBuw8UCBvOxv6V1x5Xyg,211
-pytest_revealtype_injector/hooks.py,sha256=_yJD6htagRJGElrSucFbDxSHT_osdoD9Lx3P4N5sjhM,4465
+pytest_revealtype_injector/__init__.py,sha256=AfzNNcCIxo6g21Ew_p2Dlxv02-mEZ2B_fZ8moShs98Q,211
+pytest_revealtype_injector/hooks.py,sha256=YAUsgVVd5N9FDx0gIpB7bqRYO7hJq7yli4u9nasQqzk,4930
 pytest_revealtype_injector/log.py,sha256=Ptd3yp1H1GlUum6BAwHc9cdyeGmaY8XYf0jp6qJmG4M,418
 pytest_revealtype_injector/main.py,sha256=3w-_CoZHTrBSC-5iX0cYMsW5rzdmmsqIwcw39x4E0EQ,5656
 pytest_revealtype_injector/models.py,sha256=K8b5o0OXqc58S64K6LhJ5W_fyGqtYFAsb6fmWvs3lGA,5215
@@ -7,11 +7,11 @@ pytest_revealtype_injector/plugin.py,sha256=fkI6yF0dFVba0jEikIrsRp1NUQd2ohWLq4x2
 pytest_revealtype_injector/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pytest_revealtype_injector/adapter/__init__.py,sha256=FRVB1eUrXaMzdQG0wRdIEKhx2dzGdyJcHDBb3eTTeOY,602
 pytest_revealtype_injector/adapter/basedpyright_.py,sha256=8LX7GmJmg4OZ3LKO5WoQ7Ocub6Lxi3HTStIorMApzUA,466
-pytest_revealtype_injector/adapter/mypy_.py,sha256=d69nGsdhkuKMPjqWMLj-KyY8HI9k6R7VaVUSw3P-IZg,9000
+pytest_revealtype_injector/adapter/mypy_.py,sha256=A8Uw21qm-BRMED1HiQ13McMn8jQCVTTZDnNM2inzkBE,9314
 pytest_revealtype_injector/adapter/pyright_.py,sha256=j9121YxGeulZpRRJAO0dLFpaoTjE6t343-qS-O952QU,5122
-pytest_revealtype_injector-0.6.1.dist-info/METADATA,sha256=-hYQiHx1mbDeL-su0LQYwJv2L3zTEELwWs9da_cKVWA,6729
-pytest_revealtype_injector-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pytest_revealtype_injector-0.6.1.dist-info/entry_points.txt,sha256=UfOm7y3WQnOoGV1mgTMb42MI6iBRPIl88FJiAOnt6SY,74
-pytest_revealtype_injector-0.6.1.dist-info/licenses/COPYING,sha256=LSYUX8PcSMvHCkhM5oi07eOrSLV89qdEJ-FVZmbcpNE,355
-pytest_revealtype_injector-0.6.1.dist-info/licenses/COPYING.mit,sha256=IzYEFDIOECyuupg_B3O9FvgjnU9i4JtambpbleoYHdQ,1060
-pytest_revealtype_injector-0.6.1.dist-info/RECORD,,
+pytest_revealtype_injector-0.6.3.dist-info/METADATA,sha256=rf4X6w9S1G0nk14Q4rmHCdYtW_93znizUDdvEF9aDjU,6726
+pytest_revealtype_injector-0.6.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+pytest_revealtype_injector-0.6.3.dist-info/entry_points.txt,sha256=UfOm7y3WQnOoGV1mgTMb42MI6iBRPIl88FJiAOnt6SY,74
+pytest_revealtype_injector-0.6.3.dist-info/licenses/COPYING,sha256=LSYUX8PcSMvHCkhM5oi07eOrSLV89qdEJ-FVZmbcpNE,355
+pytest_revealtype_injector-0.6.3.dist-info/licenses/COPYING.mit,sha256=IzYEFDIOECyuupg_B3O9FvgjnU9i4JtambpbleoYHdQ,1060
+pytest_revealtype_injector-0.6.3.dist-info/RECORD,,

{pytest_revealtype_injector-0.6.1.dist-info → pytest_revealtype_injector-0.6.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any