pytest-revealtype-injector 0.6.0__py3-none-any.whl → 0.6.2__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.0"
+__version__ = "0.6.2"

pytest_revealtype_injector/adapter/mypy_.py

@@ -125,6 +125,10 @@ class NameCollector(NameCollectorBase):
     # something like "test_elem_class_lookup.FooClass@97".
     # Return only the left operand after processing.
     def visit_BinOp(self, node: ast.BinOp) -> ast.expr:
+        if isinstance(node.op, ast.BitOr):  # union
+            node.left = self.visit(node.left)
+            node.right = self.visit(node.right)
+            return node
         if isinstance(node.op, ast.MatMult) and isinstance(node.right, ast.Constant):
             return cast("ast.expr", self.visit(node.left))
         # For expression that haven't been accounted for, just don't
@@ -132,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
@@ -208,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-0.6.0.dist-info → pytest_revealtype_injector-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-revealtype-injector
-Version: 0.6.0
+Version: 0.6.2
 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.6.0.dist-info → pytest_revealtype_injector-0.6.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pytest_revealtype_injector/__init__.py,sha256=AQ0K8mPMknrnsaYKFAvP9Zb1RZ-XZatYU16hN8bY9p0,211
+pytest_revealtype_injector/__init__.py,sha256=aiBTdl1GqqEAFu1nrAFIExIe_G2uGgrFYltHSNLKUXo,211
 pytest_revealtype_injector/hooks.py,sha256=_yJD6htagRJGElrSucFbDxSHT_osdoD9Lx3P4N5sjhM,4465
 pytest_revealtype_injector/log.py,sha256=Ptd3yp1H1GlUum6BAwHc9cdyeGmaY8XYf0jp6qJmG4M,418
 pytest_revealtype_injector/main.py,sha256=3w-_CoZHTrBSC-5iX0cYMsW5rzdmmsqIwcw39x4E0EQ,5656
@@ -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=lMaxQ4uTvSIG6cocOW7lGbPxLwQSv2p5cn4p2o6YOfg,8830
+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.0.dist-info/METADATA,sha256=49ryc0Nz66GiXOZePBmG5vOz74l0x2HgeWbnl_CLrh4,6729
-pytest_revealtype_injector-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pytest_revealtype_injector-0.6.0.dist-info/entry_points.txt,sha256=UfOm7y3WQnOoGV1mgTMb42MI6iBRPIl88FJiAOnt6SY,74
-pytest_revealtype_injector-0.6.0.dist-info/licenses/COPYING,sha256=LSYUX8PcSMvHCkhM5oi07eOrSLV89qdEJ-FVZmbcpNE,355
-pytest_revealtype_injector-0.6.0.dist-info/licenses/COPYING.mit,sha256=IzYEFDIOECyuupg_B3O9FvgjnU9i4JtambpbleoYHdQ,1060
-pytest_revealtype_injector-0.6.0.dist-info/RECORD,,
+pytest_revealtype_injector-0.6.2.dist-info/METADATA,sha256=CgwPmLecZ0bP_Zji97wP8lxccjtPPU3o6Y_xsoBORg0,6729
+pytest_revealtype_injector-0.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pytest_revealtype_injector-0.6.2.dist-info/entry_points.txt,sha256=UfOm7y3WQnOoGV1mgTMb42MI6iBRPIl88FJiAOnt6SY,74
+pytest_revealtype_injector-0.6.2.dist-info/licenses/COPYING,sha256=LSYUX8PcSMvHCkhM5oi07eOrSLV89qdEJ-FVZmbcpNE,355
+pytest_revealtype_injector-0.6.2.dist-info/licenses/COPYING.mit,sha256=IzYEFDIOECyuupg_B3O9FvgjnU9i4JtambpbleoYHdQ,1060
+pytest_revealtype_injector-0.6.2.dist-info/RECORD,,