Merge branch 'master' into exp_order

Author: wyattscarpenter

docs/source/command_line.rst

@@ -1176,8 +1176,8 @@ List of currently incomplete/experimental features:
 
   .. code-block:: python
 
-     def test_values() -> {"int": int, "str": str}:
-         return {"int": 42, "str": "test"}
+     def test_values() -> {"width": int, "description": str}:
+         return {"width": 42, "description": "test"}
 
 * ``PreciseTupleTypes``: this feature will infer more precise tuple types in
   various scenarios. Before variadic types were added to the Python type system

docs/source/typed_dict.rst

@@ -303,8 +303,8 @@ to use inline TypedDict syntax. For example:
 
 .. code-block:: python
 
-    def test_values() -> {"int": int, "str": str}:
-        return {"int": 42, "str": "test"}
+    def test_values() -> {"width": int, "description": str}:
+        return {"width": 42, "description": "test"}
 
     class Response(TypedDict):
         status: int

mypy/semanal.py

@@ -750,7 +750,15 @@ def add_implicit_module_attrs(self, file_node: MypyFile) -> None:
                 else:
                     inst = self.named_type_or_none("importlib.machinery.ModuleSpec")
                 if inst is None:
-                    if self.final_iteration:
+                    if (
+                        self.final_iteration
+                        or self.options.clone_for_module("importlib.machinery").follow_imports
+                        == "skip"
+                    ):
+                        # If we are not allowed to resolve imports from `importlib.machinery`,
+                        # ModuleSpec will not be available at any iteration.
+                        # Use the fallback earlier.
+                        # (see https://github.com/python/mypy/issues/18237)
                         inst = self.named_type_or_none("builtins.object")
                         assert inst is not None, "Cannot find builtins.object"
                     else:
@@ -5880,7 +5888,11 @@ def visit_call_expr(self, expr: CallExpr) -> None:
             expr.analyzed = PromoteExpr(target)
             expr.analyzed.line = expr.line
             expr.analyzed.accept(self)
-        elif refers_to_fullname(expr.callee, "builtins.dict"):
+        elif refers_to_fullname(expr.callee, "builtins.dict") and not (
+            isinstance(expr.callee, RefExpr)
+            and isinstance(expr.callee.node, TypeAlias)
+            and not expr.callee.node.no_args
+        ):
             expr.analyzed = self.translate_dict_call(expr)
         elif refers_to_fullname(expr.callee, "builtins.divmod"):
             if not self.check_fixed_args(expr, 2, "divmod"):

test-data/unit/check-type-aliases.test

@@ -1318,3 +1318,17 @@ from typing_extensions import TypeAlias
 
 Foo: TypeAlias = ClassVar[int]  # E: ClassVar[...] can't be used inside a type alias
 [builtins fixtures/tuple.pyi]
+
+
+[case testTypeAliasDict]
+D = dict[str, int]
+d = D()
+reveal_type(d)  # N: Revealed type is "builtins.dict[builtins.str, builtins.int]"
+reveal_type(D())  # N: Revealed type is "builtins.dict[builtins.str, builtins.int]"
+reveal_type(D(x=1))  # N: Revealed type is "builtins.dict[builtins.str, builtins.int]"
+reveal_type(D(x="asdf"))  # E: No overload variant of "dict" matches argument type "str" \
+                          # N: Possible overload variants: \
+                          # N:     def __init__(self, **kwargs: int) -> dict[str, int] \
+                          # N:     def __init__(self, arg: Iterable[tuple[str, int]], **kwargs: int) -> dict[str, int] \
+                          # N: Revealed type is "Any"
+[builtins fixtures/dict.pyi]

test-data/unit/cmdline.test

@@ -1393,3 +1393,21 @@ Ts = TypeVarTuple("Ts")
 Warning: TypeVarTuple is already enabled by default
 Warning: Unpack is already enabled by default
 == Return code: 0
+
+[case testImportlibImportCannotBeResolved]
+# cmd: mypy a.py
+# This test is here because it needs use_builtins_fixtures off.
+
+[file a.py]
+from typing import NamedTuple
+
+class CodecKey(NamedTuple):
+    def foo(self) -> "CodecKey":
+        ...
+
+[file mypy.ini]
+\[mypy]
+
+\[mypy-importlib.*]
+follow_imports = skip
+follow_imports_for_stubs = True