properly type the optional lxml dep

Author: wyattscarpenter

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/test/testcheck.py

@@ -7,6 +7,8 @@
 import sys
 import tempfile
 from pathlib import Path
+from types import ModuleType
+from typing import Optional
 
 from mypy import build
 from mypy.errors import CompileError
@@ -25,8 +27,9 @@
 )
 from mypy.test.update_data import update_testcase_output
 
+lxml: Optional[ModuleType] #lxml is an optional dependency
 try:
-    import lxml  # type: ignore[import-untyped]
+    import lxml
 except ImportError:
     lxml = None
 

mypy/test/testcmdline.py

@@ -10,6 +10,8 @@
 import re
 import subprocess
 import sys
+from types import ModuleType
+from typing import Optional
 
 from mypy.test.config import PREFIX, test_temp_dir
 from mypy.test.data import DataDrivenTestCase, DataSuite
@@ -19,8 +21,9 @@
     normalize_error_messages,
 )
 
+lxml: Optional[ModuleType] #lxml is an optional dependency
 try:
-    import lxml  # type: ignore[import-untyped]
+    import lxml
 except ImportError:
     lxml = None
 

mypy/test/testreports.py

@@ -3,12 +3,16 @@
 from __future__ import annotations
 
 import textwrap
+from types import ModuleType
+from typing import Optional
+
 
 from mypy.report import CoberturaPackage, get_line_rate
 from mypy.test.helpers import Suite, assert_equal
 
+lxml: Optional[ModuleType] #lxml is an optional dependency
 try:
-    import lxml  # type: ignore[import-untyped]
+    import lxml
 except ImportError:
     lxml = None
 
@@ -23,7 +27,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  # type: ignore[import-untyped]
+        import lxml.etree as etree
 
         cobertura_package = CoberturaPackage("foobar")
         cobertura_package.covered_lines = 21