Fixes from rebase

Author: KotlinIsland

.mypy/baseline.json

@@ -14,6 +14,7 @@
 import sys
 import time
 import traceback
+from argparse import RawTextHelpFormatter
 from typing import Any, Callable, Mapping, NoReturn
 
 from mypy.dmypy_os import alive, kill
@@ -32,7 +33,10 @@ def __init__(self, prog: str) -> None:
 
 
 parser = argparse.ArgumentParser(
-    prog="dmypy", description="Client for mypy daemon mode", fromfile_prefix_chars="@"
+    prog="dmypy",
+    description="Client for mypy daemon mode",
+    fromfile_prefix_chars="@",
+    formatter_class=RawTextHelpFormatter,
 )
 parser.set_defaults(action=None)
 parser.add_argument(
@@ -42,7 +46,7 @@ def __init__(self, prog: str) -> None:
     "-V",
     "--version",
     action="version",
-    version=f"Basedmypy Daemon {__based_version__}\n" f"Based on %(prog)s {__version__}",
+    version=f"Basedmypy Daemon {__based_version__}\nBased on %(prog)s {__version__}",
     help="Show program's version number and exit",
 )
 subparsers = parser.add_subparsers()
@@ -248,6 +252,7 @@ def __init__(self, prog: str) -> None:
     "flags", metavar="FLAG", nargs="*", type=str, help="Regular mypy flags (precede with --)"
 )
 p.add_argument("--options-data", help=argparse.SUPPRESS)
+p.add_argument("--legacy", action="store_true", help=argparse.SUPPRESS)
 help_parser = p = subparsers.add_parser("help")
 
 del p
@@ -606,8 +611,12 @@ def do_hang(args: argparse.Namespace) -> None:
 def do_daemon(args: argparse.Namespace) -> None:
     """Serve requests in the foreground."""
     # Lazy import so this import doesn't slow down other commands.
+    import mypy.options
     from mypy.dmypy_server import Server, process_start_options
 
+    if args.legacy:
+        mypy.options._based = False
+
     if args.options_data:
         from mypy.options import Options
 
@@ -622,6 +631,9 @@ def do_daemon(args: argparse.Namespace) -> None:
     else:
         options = process_start_options(args.flags, allow_sources=False)
         timeout = args.timeout
+    if args.legacy:
+        if not os.getenv("__MYPY_UNDER_TEST__"):
+            mypy.options._based = True
     Server(options, args.status_file, timeout=timeout).serve()
 
 

mypy/dmypy/client.py

@@ -58,6 +58,8 @@ def daemonize(
         command = [sys.executable, "-m", "mypy.dmypy", "--status-file", status_file, "daemon"]
         pickled_options = pickle.dumps((options.snapshot(), timeout, log_file))
         command.append(f'--options-data="{base64.b64encode(pickled_options).decode()}"')
+        if not mypy.options._based:
+            command.append("--legacy")
         info = STARTUPINFO()
         info.dwFlags = 0x1  # STARTF_USESHOWWINDOW aka use wShowWindow's value
         info.wShowWindow = 0  # SW_HIDE aka make the window invisible

mypy/dmypy_server.py

@@ -488,6 +488,9 @@ def expand_unpack_with_variables(
     """
     if isinstance(t.type, TypeVarTupleType):
         repl = get_proper_type(variables.get(t.type.id, t))
+        if isinstance(repl, UnionType):
+            # the type was joined (based) instead of `meet`ed, get the right hand side
+            repl = get_proper_type(repl.items[1])
         if isinstance(repl, TupleType):
             return repl.items
         elif isinstance(repl, Instance) and repl.type.fullname == "builtins.tuple":

mypy/expandtype.py

@@ -1296,7 +1296,7 @@ def add_invertible_flag(
     based_enabled_codes = (
         {
             "no-untyped-usage",
-            "partially-defined",
+            "possibly-undefined",
             "redundant-expr",
             "truthy-bool",
             "ignore-without-code",

mypy/main.py

@@ -2350,7 +2350,9 @@ def format_literal_value(typ: LiteralType) -> str:
             base_str = itype.type.name
         if not itype.args:
             # No type arguments, just return the type name
-            return TypeStrVisitor.strip_builtins(base_str)
+            if not verbosity:
+                return TypeStrVisitor.strip_builtins(base_str)
+            return base_str
         elif itype.type.fullname == "builtins.tuple":
             item_type_str = format(itype.args[0])
             if not mypy.options._based:

mypy/messages.py

@@ -50,7 +50,7 @@
 
 from __future__ import annotations
 
-from contextlib import contextmanager
+from contextlib import contextmanager, nullcontext
 from typing import Any, Callable, Collection, Iterable, Iterator, List, TypeVar, cast
 from typing_extensions import Final, TypeAlias as _TypeAlias
 
@@ -3347,13 +3347,13 @@ def is_annotated_protocol_member(self, s: AssignmentStmt) -> bool:
         )
 
     def analyze_simple_literal_type(
-        self, rvalue: Expression, is_final: bool, do_bools=False
+        self, rvalue: Expression, is_final: bool, do_inner=False
     ) -> Type | None:
         """Return builtins.int if rvalue is an int literal, etc.
 
         If this is a 'Final' context, we return "Literal[...]" instead.
         """
-        if self.function_stack and not do_bools:
+        if self.function_stack and not do_inner:
             # Skip inside a function; this is to avoid confusing
             # the code that handles dead code due to isinstance()
             # inside type variables with value restrictions (like
@@ -4898,6 +4898,10 @@ def visit_call_expr(self, expr: CallExpr) -> None:
             expr.analyzed = OpExpr("divmod", expr.args[0], expr.args[1])
             expr.analyzed.line = expr.line
             expr.analyzed.accept(self)
+        elif refers_to_fullname(expr.callee, "typing.TypeVar"):
+            for a, a_name in zip(expr.args, expr.arg_names):
+                with self.allow_unbound_tvars_set() if a_name == "bound" else nullcontext():
+                    a.accept(self)
         else:
             # Normal call expression.
             for a in expr.args:
@@ -6671,7 +6675,7 @@ def is_unannotated_any(typ_: Type) -> bool:
                 typ = None
                 if arg.variable.is_inferred and arg.initializer:
                     arg.initializer.accept(self)
-                    typ = self.analyze_simple_literal_type(arg.initializer, False, do_bools=True)
+                    typ = self.analyze_simple_literal_type(arg.initializer, False, do_inner=True)
                 arg_types.append(typ or UntypedType())
         ret_type = None
         if self.options.default_return and self.options.disallow_untyped_defs:
@@ -6706,7 +6710,7 @@ def is_unannotated_any(typ_: Type) -> bool:
                 if is_unannotated_any(defn.type.arg_types[i]):
                     if arg.variable.is_inferred and arg.initializer:
                         ret = self.analyze_simple_literal_type(
-                            arg.initializer, False, do_bools=True
+                            arg.initializer, False, do_inner=True
                         )
                         if ret:
                             defn.type.arg_types[i] = ret

mypy/semanal.py

@@ -401,7 +401,7 @@ def _verify_final(
 ) -> Iterator[Error]:
     try:
 
-        class SubClass(runtime):  # type: ignore[misc]
+        class SubClass(runtime):  # type: ignore[no-subclass-any]
             pass
 
     except TypeError:

mypy/stubtest.py

@@ -651,7 +651,7 @@ def split_test_cases(
         line_no += data.count("\n") + 1
 
         # Record existing tests to prevent duplicates:
-        test_names.update({name})
+        test_names.update({name})  # type: ignore[no-untyped-call]
 
 
 class DataSuiteCollector(pytest.Class):

mypy/test/data.py

@@ -91,6 +91,7 @@ def run_cmd(input: str) -> tuple[int, str]:
         input = sys.executable + " -m" + input
     env = os.environ.copy()
     env["PYTHONPATH"] = PREFIX
+    env["__MYPY_UNDER_TEST__"] = "1"
     try:
         output = subprocess.check_output(
             input, shell=True, stderr=subprocess.STDOUT, text=True, cwd=test_temp_dir, env=env

mypy/test/testdaemon.py

@@ -13,11 +13,10 @@ nonlocal_partial_types = True
 allow_any_expr = True
 allow_any_explicit = True
 allow_any_decorated = True
-allow_subclassing_any = True
 no_warn_unreachable = True
 implicit_reexport = True
 disallow_redefinition = True
-disable_error_code = truthy-bool, no-untyped-usage, partially-defined
+disable_error_code = truthy-bool, no-untyped-usage, possibly-undefined
 bare_literals = True
 
 [mypy-mypy.*,mypyc.*]

mypy_self_check.ini

@@ -31,7 +31,6 @@ def foo3(x: Concatenate[int, P]) -> int: ...  # E: Invalid location for Concaten
                                               # N: You can use Concatenate as the first argument to Callable
 
 def foo4(x: List[P]) -> None: ...  # E: Invalid location for ParamSpec "P" \
-                                   # E: Invalid location for ParamSpec "P" \
                                    # N: You can use ParamSpec as the first argument to Callable, e.g., 'Callable[P, int]'
 
 def foo5(x: Callable[[int, str], P]) -> None: ...  # E: Invalid location for ParamSpec "P" \

test-data/unit/check-parameter-specification.test

@@ -1401,7 +1401,8 @@ reveal_type(var)  # N: Revealed type is "Any"
 def foo() -> Self: ...  # E: Self type is only allowed in annotations within class definition
 reveal_type(foo)  # N: Revealed type is "def () -> Any"
 
-bad: Callable[[Self], Self]  # E: Self type is only allowed in annotations within class definition
+bad: Callable[[Self], Self]  # E: Self type is only allowed in annotations within class definition \
+                             # E: Self type is only allowed in annotations within class definition
 reveal_type(bad)  # N: Revealed type is "def (Any) -> Any"
 
 def func() -> None:

test-data/unit/check-selftype.test

@@ -1855,6 +1855,6 @@ _testTupleWithDifferentArgsPy310.py:17: note: Revealed type is "Union[builtins.t
 _testTupleWithDifferentArgsPy310.py:18: note: Revealed type is "Tuple[builtins.float, builtins.str]"
 _testTupleWithDifferentArgsPy310.py:19: note: Revealed type is "builtins.tuple[builtins.float, ...]"
 _testTupleWithDifferentArgsPy310.py:20: note: Revealed type is "builtins.list[Tuple[builtins.int, builtins.str]]"
-_testTupleWithDifferentArgsPy310.py:26: error: Invalid type: try using Literal[1] instead?
+_testTupleWithDifferentArgsPy310.py:26: error: "1" is a bare literal and cannot be used here, try Literal[1] instead?
 _testTupleWithDifferentArgsPy310.py:27: error: Unexpected "..."
 _testTupleWithDifferentArgsPy310.py:30: note: Revealed type is "builtins.tuple[builtins.object, ...]"