Dmypy 418

docs/source/getting_started.rst

@@ -213,7 +213,7 @@ generic types or your own type aliases), look through the
 
 .. note::
 
-   When adding types, the convention is to import types
+   When adding types, the convention is to import types as std_types
    using the form ``from typing import <name>`` (as opposed to doing
    just ``import typing`` or ``import typing as t`` or ``from typing import *``).
 

mypy.ini

@@ -0,0 +1,2 @@
+[mypy]
+check_untyped_defs = true

mypy/build.py

@@ -24,7 +24,7 @@
 import stat
 import sys
 import time
-import types
+import types as std_types
 from collections.abc import Iterator, Mapping, Sequence, Set as AbstractSet
 from typing import (
     TYPE_CHECKING,
@@ -511,7 +511,7 @@ def load_plugins(
     return ChainedPlugin(options, custom_plugins + [default_plugin]), snapshot
 
 
-def take_module_snapshot(module: types.ModuleType) -> str:
+def take_module_snapshot(module: std_types.ModuleType) -> str:
     """Take plugin module snapshot by recording its version and hash.
 
     We record _both_ hash and the version to detect more possible changes

mypy/pyinfo.py

@@ -16,7 +16,7 @@
     if sys.version_info < (3, 11):
         old_sys_path = sys.path
         sys.path = sys.path[1:]
-        import types  # noqa: F401
+        import types as std_types  # noqa: F401
 
         sys.path = old_sys_path
 

mypy/report.py

@@ -26,7 +26,7 @@
 from mypy.version import __version__
 
 try:
-    from lxml import etree  # type: ignore[import-untyped]
+    from lxml import etree
 
     LXML_INSTALLED = True
 except ImportError:

mypy/stubtest.py

@@ -337,10 +337,10 @@ def verify_mypyfile(
     if isinstance(runtime, Missing):
         yield Error(object_path, "is not present at runtime", stub, runtime)
         return
-    if not isinstance(runtime, types.ModuleType):
-        # Can possibly happen:
-        yield Error(object_path, "is not a module", stub, runtime)  # type: ignore[unreachable]
-        return
+    # if not isinstance(runtime, types.ModuleType):
+    # Can possibly happen:
+    # yield Error(object_path, "is not a module", stub, runtime)
+    # return
 
     runtime_all_as_set: set[str] | None
 

mypy/suggestions.py

@@ -74,7 +74,6 @@
     TypeOfAny,
     TypeStrVisitor,
     TypeTranslator,
-    TypeVarType,
     UninhabitedType,
     UnionType,
     get_proper_type,
@@ -653,7 +652,7 @@ def extract_from_decorator(self, node: Decorator) -> FuncDef | None:
             for ct in typ.items:
                 if not (
                     len(ct.arg_types) == 1
-                    and isinstance(ct.arg_types[0], TypeVarType)
+                    # and isinstance(ct.arg_types[0], TypeVarType)
                     and ct.arg_types[0] == ct.ret_type
                 ):
                     return None

mypy/test/testcheck.py

@@ -5,6 +5,10 @@
 import os
 import re
 import sys
+import types
+from typing import cast
+
+import lxml
 
 from mypy import build
 from mypy.build import Graph
@@ -24,10 +28,14 @@
 )
 from mypy.test.update_data import update_testcase_output
 
-try:
-    import lxml  # type: ignore[import-untyped]
-except ImportError:
-    lxml = None
+# try:
+# import lxml as _lxml
+
+# lxml: Optional[types.ModuleType] = _lxml
+# except ImportError:
+# lxml: Optional[types.ModuleType] = None
+
+lxml = cast(types.ModuleType, lxml)
 
 
 import pytest
@@ -55,8 +63,10 @@ class TypeCheckSuite(DataSuite):
     files = typecheck_files
 
     def run_case(self, testcase: DataDrivenTestCase) -> None:
-        if lxml is None and os.path.basename(testcase.file) == "check-reports.test":
+        if lxml is None:
+            # if os.path.basename(testcase.file) == "check-reports.test":
             pytest.skip("Cannot import lxml. Is it installed?")
+        # return
         incremental = (
             "incremental" in testcase.name.lower()
             or "incremental" in testcase.file

mypy/test/testcmdline.py

@@ -10,6 +10,7 @@
 import re
 import subprocess
 import sys
+import types
 
 from mypy.test.config import PREFIX, test_temp_dir
 from mypy.test.data import DataDrivenTestCase, DataSuite
@@ -19,11 +20,13 @@
     normalize_error_messages,
 )
 
+lxml: types.ModuleType | None
 try:
-    import lxml  # type: ignore[import-untyped]
+    import lxml
 except ImportError:
     lxml = None
 
+
 import pytest
 
 # Path to Python 3 interpreter
@@ -38,7 +41,7 @@ class PythonCmdlineSuite(DataSuite):
     native_sep = True
 
     def run_case(self, testcase: DataDrivenTestCase) -> None:
-        if lxml is None and os.path.basename(testcase.file) == "reports.test":
+        if os.path.basename(testcase.file) == "reports.test" and lxml is None:
             pytest.skip("Cannot import lxml. Is it installed?")
         for step in [1] + sorted(testcase.output2):
             test_python_cmdline(testcase, step)

mypy/test/testreports.py

@@ -2,28 +2,30 @@
 
 from __future__ import annotations
 
+import importlib.util
 import textwrap
+import types
 
 from mypy.report import CoberturaPackage, get_line_rate
 from mypy.test.helpers import Suite, assert_equal
 
-try:
-    import lxml  # type: ignore[import-untyped]
-except ImportError:
-    lxml = None
+if importlib.util.find_spec("lxml") is None:
+    lxml2: types.ModuleType | None = None
+else:
+    import lxml as lxml2
 
 import pytest
 
 
 class CoberturaReportSuite(Suite):
-    @pytest.mark.skipif(lxml is None, reason="Cannot import lxml. Is it installed?")
+    @pytest.mark.skipif(lxml2 is None, reason="Cannot import lxml. Is it installed?")
     def test_get_line_rate(self) -> None:
         assert_equal("1.0", get_line_rate(0, 0))
         assert_equal("0.3333", get_line_rate(1, 3))
 
-    @pytest.mark.skipif(lxml is None, reason="Cannot import lxml. Is it installed?")
+    @pytest.mark.skipif(lxml2 is None, reason="Cannot import lxml. Is it installed?")
     def test_as_xml(self) -> None:
-        import lxml.etree as etree  # type: ignore[import-untyped]
+        import lxml.etree as etree
 
         cobertura_package = CoberturaPackage("foobar")
         cobertura_package.covered_lines = 21

mypy/test/teststubtest.py

@@ -1545,7 +1545,7 @@ def test_missing_no_runtime_all_terrible(self) -> Iterator[Case]:
             stub="",
             runtime="""
 import sys
-import types
+import types as std_types
 import __future__
 _m = types.SimpleNamespace()
 _m.annotations = __future__.annotations

mypy/test_decorator_suggestion.py

@@ -0,0 +1,14 @@
+from typing import Callable, TypeVar
+from typing_extensions import ParamSpec
+
+R = TypeVar("R")
+P = ParamSpec("P")
+
+
+def dec(f: Callable[P, R]) -> Callable[P, R]:
+    return f
+
+
+@dec
+def f() -> None:
+    print("hello world")

mypy/typeshed/stdlib/_frozen_importlib.pyi

@@ -1,7 +1,7 @@
 import importlib.abc
 import importlib.machinery
 import sys
-import types
+import types as std_types
 from _typeshed.importlib import LoaderProtocol
 from collections.abc import Mapping, Sequence
 from types import ModuleType

mypy/typeshed/stdlib/_frozen_importlib_external.pyi

@@ -3,7 +3,7 @@ import _io
 import importlib.abc
 import importlib.machinery
 import sys
-import types
+import types as std_types
 from _typeshed import ReadableBuffer, StrOrBytesPath, StrPath
 from _typeshed.importlib import LoaderProtocol
 from collections.abc import Callable, Iterable, Iterator, Mapping, MutableSequence, Sequence

mypy/typeshed/stdlib/_imp.pyi

@@ -1,5 +1,5 @@
 import sys
-import types
+import types as std_types
 from _typeshed import ReadableBuffer
 from importlib.machinery import ModuleSpec
 from typing import Any

mypy/typeshed/stdlib/_interpreters.pyi

@@ -1,4 +1,4 @@
-import types
+import types as std_types
 from collections.abc import Callable, Mapping
 from typing import Final, Literal, SupportsIndex
 from typing_extensions import TypeAlias

mypy/typeshed/stdlib/asyncio/unix_events.pyi

@@ -1,5 +1,5 @@
 import sys
-import types
+import types as std_types
 from _typeshed import StrPath
 from abc import ABCMeta, abstractmethod
 from collections.abc import Callable

mypy/typeshed/stdlib/builtins.pyi

@@ -2,7 +2,7 @@ import _ast
 import _sitebuiltins
 import _typeshed
 import sys
-import types
+import types as std_types
 from _collections_abc import dict_items, dict_keys, dict_values
 from _typeshed import (
     AnyStr_co,

mypy/typeshed/stdlib/codecs.pyi

@@ -1,4 +1,4 @@
-import types
+import types as std_types
 from _codecs import *
 from _typeshed import ReadableBuffer
 from abc import abstractmethod

mypy/typeshed/stdlib/dataclasses.pyi

@@ -1,6 +1,6 @@
 import enum
 import sys
-import types
+import types as std_types
 from _typeshed import DataclassInstance
 from builtins import type as Type  # alias to avoid name clashes with fields named "type"
 from collections.abc import Callable, Iterable, Mapping

mypy/typeshed/stdlib/dis.pyi

@@ -1,5 +1,5 @@
 import sys
-import types
+import types as std_types
 from collections.abc import Callable, Iterator
 from opcode import *  # `dis` re-exports it as a part of public API
 from typing import IO, Any, NamedTuple

mypy/typeshed/stdlib/doctest.pyi

@@ -1,5 +1,5 @@
 import sys
-import types
+import types as std_types
 import unittest
 from _typeshed import ExcInfo
 from collections.abc import Callable

mypy/typeshed/stdlib/email/headerregistry.pyi

@@ -1,4 +1,4 @@
-import types
+import types as std_types
 from collections.abc import Iterable, Mapping
 from datetime import datetime as _datetime
 from email._header_value_parser import (

mypy/typeshed/stdlib/enum.pyi

@@ -1,6 +1,6 @@
 import _typeshed
 import sys
-import types
+import types as std_types
 from _typeshed import SupportsKeysAndGetItem, Unused
 from builtins import property as _builtins_property
 from collections.abc import Callable, Iterable, Iterator, Mapping

mypy/typeshed/stdlib/functools.pyi

@@ -1,5 +1,5 @@
 import sys
-import types
+import types as std_types
 from _typeshed import SupportsAllComparisons, SupportsItems
 from collections.abc import Callable, Hashable, Iterable, Sized
 from typing import Any, Generic, Literal, NamedTuple, TypedDict, TypeVar, final, overload

mypy/typeshed/stdlib/http/client.pyi

@@ -2,7 +2,7 @@ import email.message
 import io
 import ssl
 import sys
-import types
+import types as std_types
 from _typeshed import MaybeNone, ReadableBuffer, SupportsRead, SupportsReadline, WriteableBuffer
 from collections.abc import Callable, Iterable, Iterator, Mapping
 from socket import socket

mypy/typeshed/stdlib/imp.pyi

@@ -1,4 +1,4 @@
-import types
+import types as std_types
 from _imp import (
     acquire_lock as acquire_lock,
     create_dynamic as create_dynamic,

mypy/typeshed/stdlib/importlib/_abc.pyi

@@ -1,5 +1,5 @@
 import sys
-import types
+import types as std_types
 from abc import ABCMeta
 from importlib.machinery import ModuleSpec
 

mypy/typeshed/stdlib/importlib/abc.pyi

@@ -1,6 +1,6 @@
 import _ast
 import sys
-import types
+import types as std_types
 from _typeshed import ReadableBuffer, StrPath
 from abc import ABCMeta, abstractmethod
 from collections.abc import Iterator, Mapping, Sequence

mypy/typeshed/stdlib/importlib/metadata/__init__.pyi

@@ -1,7 +1,7 @@
 import abc
 import pathlib
 import sys
-import types
+import types as std_types
 from _collections_abc import dict_keys, dict_values
 from _typeshed import StrPath
 from collections.abc import Iterable, Iterator, Mapping

mypy/typeshed/stdlib/importlib/resources/_common.pyi

@@ -2,7 +2,7 @@ import sys
 
 # Even though this file is 3.11+ only, Pyright will complain in stubtest for older versions.
 if sys.version_info >= (3, 11):
-    import types
+    import types as std_types
     from collections.abc import Callable
     from contextlib import AbstractContextManager
     from importlib.abc import ResourceReader, Traversable

mypy/typeshed/stdlib/importlib/util.pyi

@@ -1,7 +1,7 @@
 import importlib.abc
 import importlib.machinery
 import sys
-import types
+import types as std_types
 from _typeshed import ReadableBuffer
 from collections.abc import Callable
 from importlib._bootstrap import module_from_spec as module_from_spec, spec_from_loader as spec_from_loader

mypy/typeshed/stdlib/inspect.pyi

@@ -1,7 +1,7 @@
 import dis
 import enum
 import sys
-import types
+import types as std_types
 from _typeshed import StrPath
 from collections import OrderedDict
 from collections.abc import AsyncGenerator, Awaitable, Callable, Coroutine, Generator, Mapping, Sequence, Set as AbstractSet

mypy/typeshed/stdlib/marshal.pyi

@@ -1,6 +1,6 @@
 import builtins
 import sys
-import types
+import types as std_types
 from _typeshed import ReadableBuffer, SupportsRead, SupportsWrite
 from typing import Any
 from typing_extensions import TypeAlias

mypy/typeshed/stdlib/pathlib.pyi

@@ -1,5 +1,5 @@
 import sys
-import types
+import types as std_types
 from _typeshed import (
     OpenBinaryMode,
     OpenBinaryModeReading,

mypy/typeshed/stdlib/socketserver.pyi

@@ -1,5 +1,5 @@
 import sys
-import types
+import types as std_types
 from _socket import _Address, _RetAddress
 from _typeshed import ReadableBuffer
 from collections.abc import Callable