removing conflict with types.py

Jdwashin9 · Jdwashin9 · commit 3ff8f8937c85 · 2025-04-18T11:03:00.000-04:00
diff --git a/docs/source/getting_started.rst b/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 *``).
 
diff --git a/mypy.ini b/mypy.ini
@@ -0,0 +1,2 @@
+[mypy]
+check_untyped_defs = true
diff --git a/mypy/build.py b/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,
diff --git a/mypy/pyinfo.py b/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
 
diff --git a/mypy/server/objgraph.py b/mypy/server/objgraph.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-import types
+import types as std_types
 import weakref
 from collections.abc import Iterable, Iterator, Mapping
 from typing import Final
diff --git a/mypy/stubtest.py b/mypy/stubtest.py
@@ -20,7 +20,7 @@
 import symtable
 import sys
 import traceback
-import types
+import types as std_types
 import typing
 import typing_extensions
 import warnings
diff --git a/mypy/test/teststubtest.py b/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
diff --git a/mypy/typeshed/stdlib/_frozen_importlib.pyi b/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
diff --git a/mypy/typeshed/stdlib/_frozen_importlib_external.pyi b/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
diff --git a/mypy/typeshed/stdlib/_imp.pyi b/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
diff --git a/mypy/typeshed/stdlib/_interpreters.pyi b/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
diff --git a/mypy/typeshed/stdlib/asyncio/unix_events.pyi b/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
diff --git a/mypy/typeshed/stdlib/builtins.pyi b/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,
diff --git a/mypy/typeshed/stdlib/codecs.pyi b/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
diff --git a/mypy/typeshed/stdlib/dataclasses.pyi b/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
diff --git a/mypy/typeshed/stdlib/dis.pyi b/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
diff --git a/mypy/typeshed/stdlib/doctest.pyi b/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
diff --git a/mypy/typeshed/stdlib/email/headerregistry.pyi b/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 (
diff --git a/mypy/typeshed/stdlib/enum.pyi b/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
diff --git a/mypy/typeshed/stdlib/functools.pyi b/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
diff --git a/mypy/typeshed/stdlib/http/client.pyi b/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
diff --git a/mypy/typeshed/stdlib/imp.pyi b/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,
diff --git a/mypy/typeshed/stdlib/importlib/_abc.pyi b/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
 
diff --git a/mypy/typeshed/stdlib/importlib/abc.pyi b/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
diff --git a/mypy/typeshed/stdlib/importlib/metadata/__init__.pyi b/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
diff --git a/mypy/typeshed/stdlib/importlib/resources/_common.pyi b/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
diff --git a/mypy/typeshed/stdlib/importlib/util.pyi b/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
diff --git a/mypy/typeshed/stdlib/inspect.pyi b/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
diff --git a/mypy/typeshed/stdlib/marshal.pyi b/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
diff --git a/mypy/typeshed/stdlib/pathlib.pyi b/mypy/typeshed/stdlib/pathlib.pyi
@@ -1,5 +1,5 @@
 import sys
-import types
+import types as std_types
 from _typeshed import (
     OpenBinaryMode,
     OpenBinaryModeReading,
diff --git a/mypy/typeshed/stdlib/socketserver.pyi b/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
diff --git a/mypy/typeshed/stdlib/trace.pyi b/mypy/typeshed/stdlib/trace.pyi
@@ -1,5 +1,5 @@
 import sys
-import types
+import types as std_types
 from _typeshed import Incomplete, StrPath, TraceFunction
 from collections.abc import Callable, Iterable, Mapping, Sequence
 from typing import Any, TypeVar
diff --git a/test-data/unit/check-classes.test b/test-data/unit/check-classes.test
@@ -4918,7 +4918,7 @@ def g(x: Type[S]) -> str:
     return reveal_type(x * 0)  # N: Revealed type is "builtins.str"
 
 [case testMetaclassGetitem]
-import types
+import types as std_types
 
 class M(type):
     def __getitem__(self, key) -> int: return 1
diff --git a/test-data/unit/check-functions.test b/test-data/unit/check-functions.test
@@ -1831,7 +1831,7 @@ F = Callable[[Arg(int, 'x')], int]  # E: Invalid argument constructor "__main__.
 from typing import Callable, List
 from mypy_extensions import Arg, VarArg, KwArg
 import mypy_extensions
-import types  # Needed for type checking
+import types as std_types  # Needed for type checking
 
 def WrongArg(x, y): return y
 # Note that for this test, the 'Value of type "int" is not indexable' errors are silly,
diff --git a/test-data/unit/check-generics.test b/test-data/unit/check-generics.test
@@ -454,7 +454,7 @@ A[int, str, int]() # E: Type application has too many types (2 expected)
 [out]
 
 [case testInvalidTypeApplicationType]
-import types
+import types as std_types
 a: A
 class A: pass
 a[A]()  # E: Value of type "A" is not indexable
@@ -516,7 +516,7 @@ Alias[int]("a")  # E: Argument 1 to "Node" has incompatible type "str"; expected
 
 [case testTypeApplicationCrash]
 # flags: --python-version 3.8
-import types
+import types as std_types
 type[int] # this was crashing, see #2302 (comment)  # E: The type "Type[type]" is not generic and not indexable
 [builtins fixtures/tuple.pyi]
 
diff --git a/test-data/unit/check-modules.test b/test-data/unit/check-modules.test
@@ -1577,7 +1577,7 @@ AnyCallable = Callable[..., Any]
 [out]
 
 [case testRevealType]
-import types
+import types as std_types
 def f() -> types.ModuleType:
     return types
 reveal_type(f())  # N: Revealed type is "types.ModuleType"
@@ -1689,7 +1689,7 @@ b = 'bar'
 
 [case testModuleAliasWithExplicitAnnotation]
 from typing import Any
-import types
+import types as std_types
 import m
 mod_mod: types.ModuleType = m
 mod_mod2: types.ModuleType
@@ -1712,7 +1712,7 @@ a = 'foo'
 [builtins fixtures/module.pyi]
 
 [case testModuleAliasPassedToFunction]
-import types
+import types as std_types
 import m
 
 def takes_module(x: types.ModuleType):
@@ -1754,7 +1754,7 @@ a = 3
 [builtins fixtures/module.pyi]
 
 [case testModuleAliasRepeatedWithAnnotation]
-import types
+import types as std_types
 import m, n
 
 x: types.ModuleType
diff --git a/test-data/unit/check-python312.test b/test-data/unit/check-python312.test
@@ -1671,7 +1671,7 @@ x: Comparable[Good]
 y: Comparable[int]  # E: Type argument "int" of "Comparable" must be a subtype of "Comparable[Any]"
 
 [case testPEP695TypeAliasWithDifferentTargetTypes]
-import types  # We need GenericAlias from here, and test stubs don't bring in 'types'
+import types as std_types  # We need GenericAlias from here, and test stubs don't bring in 'types'
 from typing import Any, Callable, List, Literal, TypedDict
 
 # Test that various type expressions don't generate false positives as type alias
diff --git a/test-data/unit/check-type-object-type-inference.test b/test-data/unit/check-type-object-type-inference.test
@@ -2,7 +2,7 @@
 # flags: --python-version 3.9
 from typing import TypeVar, Generic, Type
 from abc import abstractmethod
-import types  # Explicitly bring in stubs for 'types'
+import types as std_types  # Explicitly bring in stubs for 'types'
 
 T = TypeVar('T')
 class E(Generic[T]):
diff --git a/test-data/unit/check-typeguard.test b/test-data/unit/check-typeguard.test
@@ -326,7 +326,7 @@ main:5: note:          def is_float(self, a: object) -> bool
 [case testTypeGuardInAnd]
 from typing import Any
 from typing_extensions import TypeGuard
-import types
+import types as std_types
 def isclass(a: object) -> bool:
     pass
 def ismethod(a: object) -> TypeGuard[float]:
diff --git a/test-data/unit/fixtures/fine_grained.pyi b/test-data/unit/fixtures/fine_grained.pyi
@@ -3,7 +3,7 @@
 # TODO: Migrate to regular stubs once fine-grained incremental is robust
 #       enough to handle them.
 
-import types
+import types as std_types
 from typing import TypeVar, Generic
 
 T = TypeVar('T')
diff --git a/test-data/unit/fixtures/isinstance_python3_10.pyi b/test-data/unit/fixtures/isinstance_python3_10.pyi
@@ -1,6 +1,6 @@
 # For Python 3.10+ only
 from typing import Tuple, TypeVar, Generic, Union, cast, Any, Type
-import types
+import types as std_types
 
 T = TypeVar('T')
 
diff --git a/test-data/unit/fixtures/type.pyi b/test-data/unit/fixtures/type.pyi
@@ -2,7 +2,7 @@
 
 from typing import Any, Generic, TypeVar, List, Union
 import sys
-import types
+import types as std_types
 
 T = TypeVar("T")
 S = TypeVar("S")
diff --git a/test-data/unit/stubgen.test b/test-data/unit/stubgen.test

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[mypy]`
	`2`	`+check_untyped_defs = true`