Add logic to support mypy 1.16.0

Author: Jazzinghen

returns/contrib/mypy/_features/kind.py

@@ -1,5 +1,6 @@
 from collections.abc import Sequence
 from enum import Enum, unique
+from typing import Any
 
 from mypy.checkmember import analyze_member_access
 from mypy.plugin import (
@@ -21,6 +22,7 @@
     get_proper_type,
 )
 from mypy.types import Type as MypyType
+from mypy.version import __version__ as mypy_version
 
 from returns.contrib.mypy._typeops.fallback import asserts_fallback_to_any
 from returns.contrib.mypy._typeops.visitor import translate_kind_instance
@@ -62,17 +64,24 @@ def attribute_access(ctx: AttributeContext) -> MypyType:
         return ctx.default_attr_type
 
     exprchecker = ctx.api.expr_checker  # type: ignore
+    mypy_version_tuple = tuple(
+        map(int, mypy_version.partition('+')[0].split('.'))
+    )
+
+    extra_kwargs: dict[str, Any] = {}
+    if mypy_version_tuple < (1, 16):
+        extra_kwargs['msg'] = ctx.api.msg
     return analyze_member_access(
         ctx.context.name,  # type: ignore
         accessed,
         ctx.context,
         is_lvalue=False,
         is_super=False,
         is_operator=False,
-        msg=ctx.api.msg,
         original_type=instance,
         chk=ctx.api,  # type: ignore
         in_literal_context=exprchecker.is_literal_context(),
+        **extra_kwargs,
     )
 
 

returns/contrib/mypy/_typeops/analtype.py

@@ -1,10 +1,12 @@
+from collections.abc import Sequence
 from types import MappingProxyType
-from typing import Final, Literal, overload
+from typing import Any, Final, Literal, overload
 
 from mypy.checkmember import analyze_member_access
 from mypy.nodes import ARG_NAMED, ARG_OPT
 from mypy.types import CallableType, FunctionLike, ProperType, get_proper_type
 from mypy.types import Type as MypyType
+from mypy.version import __version__ as mypy_version
 
 from returns.contrib.mypy._structures.args import FuncArg
 from returns.contrib.mypy._structures.types import CallableContext
@@ -21,7 +23,7 @@
 @overload
 def analyze_call(
     function: FunctionLike,
-    args: list[FuncArg],
+    args: Sequence[FuncArg],
     ctx: CallableContext,
     *,
     show_errors: Literal[True],
@@ -31,14 +33,20 @@ def analyze_call(
 @overload
 def analyze_call(
     function: FunctionLike,
-    args: list[FuncArg],
+    args: Sequence[FuncArg],
     ctx: CallableContext,
     *,
     show_errors: bool,
 ) -> CallableType | None: ...
 
 
-def analyze_call(function, args, ctx, *, show_errors):
+def analyze_call(
+    function: FunctionLike,
+    args: Sequence[FuncArg],
+    ctx: CallableContext,
+    *,
+    show_errors: bool,
+) -> CallableType | None:
     """
     Analyzes function call based on passed arguments.
 
@@ -48,7 +56,7 @@ def analyze_call(function, args, ctx, *, show_errors):
     We also allow to return ``None`` instead of showing errors.
     This might be helpful for cases when we run intermediate analysis.
     """
-    checker = ctx.api.expr_checker
+    checker = ctx.api.expr_checker  # type: ignore[attr-defined]
     with checker.msg.filter_errors(save_filtered_errors=True) as local_errors:
         _return_type, checked_function = checker.check_call(
             function,
@@ -63,7 +71,7 @@ def analyze_call(function, args, ctx, *, show_errors):
 
     checker.msg.add_errors(local_errors.filtered_errors())  # noqa: WPS441
 
-    return checked_function
+    return checked_function  # type: ignore[no-any-return]
 
 
 def safe_translate_to_function(
@@ -110,6 +118,15 @@ def translate_to_function(
     This also preserves all type arguments as-is.
     """
     checker = ctx.api.expr_checker  # type: ignore
+
+    mypy_version_tuple = tuple(
+        map(int, mypy_version.partition('+')[0].split('.'))
+    )
+
+    extra_kwargs: dict[str, Any] = {}
+    if mypy_version_tuple > (1, 16):
+        extra_kwargs['msg'] = checker.msg
+
     return get_proper_type(
         analyze_member_access(
             '__call__',
@@ -118,9 +135,8 @@ def translate_to_function(
             is_lvalue=False,
             is_super=False,
             is_operator=True,
-            msg=checker.msg,
             original_type=function_def,
             chk=checker.chk,
-            in_literal_context=checker.is_literal_context(),
+            **extra_kwargs,
         )
     )

tests/test_contrib/test_hypothesis/test_laws/test_custom_strategy_for_callable.py

@@ -120,8 +120,8 @@ def do_nothing(
 def _callable_strategy(
     arg1: type[object], arg2: type[object]
 ) -> StrategyFactory[Callable]:
-    type_arg1 = int if arg1 == Any else arg1  # type: ignore[comparison-overlap]
-    type_arg2 = int if arg2 == Any else arg2  # type: ignore[comparison-overlap]
+    type_arg1 = int if arg1 == Any else arg1
+    type_arg2 = int if arg2 == Any else arg2
     return_results = st.functions(
         pure=True,
         returns=strategy_from_container(Result)(Result[type_arg1, type_arg2]),  # type: ignore[valid-type]