deleted unrelate file changes

Author: lesliehuh

mypy.ini

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

mypy/report.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)
-    # return
+    if not isinstance(runtime, types.ModuleType):
+        # Can possibly happen:
+        yield Error(object_path, "is not a module", stub, runtime)  # type: ignore[unreachable]
+        return
 
     runtime_all_as_set: set[str] | None
 

mypy/stubtest.py

@@ -651,17 +651,13 @@ def extract_from_decorator(self, node: Decorator) -> FuncDef | None:
             if not isinstance(typ, FunctionLike):
                 return None
             for ct in typ.items:
-                if len(ct.arg_types) != 1:
+                if not (
+                    len(ct.arg_types) == 1
+                    and isinstance(ct.arg_types[0], TypeVarType)
+                    and ct.arg_types[0] == ct.ret_type
+                ):
                     return None
-
-            arg_type = get_proper_type(ct.arg_types[0])
-            ret_type = get_proper_type(ct.ret_type)
-
-            if isinstance(arg_type, TypeVarType) and arg_type == ret_type:
-                continue
-
-            return None
-
+        
         return node.func
 
     def try_type(self, func: FuncDef, typ: ProperType) -> list[str]:

mypy/suggestions.py

@@ -5,9 +5,7 @@
 import os
 import re
 import sys
-import types
 
-import pytest
 
 from mypy import build
 from mypy.build import Graph
@@ -29,12 +27,12 @@
 
 lxml: types.ModuleType | None
 try:
-    import importlib
-
-    lxml = importlib.import_module("lxml")
+    import lxml  # type: ignore[import-untyped]
 except ImportError:
     lxml = None
 
+import pytest
+
 # List of files that contain test case descriptions.
 # Includes all check-* files with the .test extension in the test-data/unit directory
 typecheck_files = find_test_files(pattern="check-*.test")
@@ -58,10 +56,8 @@ class TypeCheckSuite(DataSuite):
     files = typecheck_files
 
     def run_case(self, testcase: DataDrivenTestCase) -> None:
-        if lxml is None:
-            # if os.path.basename(testcase.file) == "check-reports.test":
+        if lxml is None and 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/testcheck.py

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

mypy/test/testcmdline.py

@@ -2,18 +2,13 @@
 
 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
 
-lxml: types.ModuleType | None
 try:
-    import importlib
-
-    lxml = importlib.import_module("lxml")
+    import lxml  # type: ignore[import-untyped]
 except ImportError:
     lxml = None
 
@@ -28,7 +23,7 @@ def test_get_line_rate(self) -> None:
 
     @pytest.mark.skipif(lxml is None, reason="Cannot import lxml. Is it installed?")
     def test_as_xml(self) -> None:
-        import lxml.etree as etree
+        import lxml.etree as etree  # type: ignore[import-untyped]
 
         cobertura_package = CoberturaPackage("foobar")
         cobertura_package.covered_lines = 21