adapt the way lxml is imported to adapt to it not being any more

Author: wyattscarpenter

mypy/test/testcheck.py

@@ -27,7 +27,7 @@
 try:
     import lxml
 except ImportError:
-    lxml = None
+    lxml_import_failure = True
 
 
 import pytest
@@ -55,7 +55,7 @@ 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_import_failure and os.path.basename(testcase.file) == "check-reports.test":
             pytest.skip("Cannot import lxml. Is it installed?")
         incremental = (
             "incremental" in testcase.name.lower()

mypy/test/testcmdline.py

@@ -22,7 +22,7 @@
 try:
     import lxml
 except ImportError:
-    lxml = None
+    lxml_import_failure = True
 
 import pytest
 
@@ -38,7 +38,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 lxml_import_failure 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/testreports.py

@@ -10,18 +10,18 @@
 try:
     import lxml
 except ImportError:
-    lxml = None
+    lxml_import_failure = True
 
 import pytest
 
 
 class CoberturaReportSuite(Suite):
-    @pytest.mark.skipif(lxml is None, reason="Cannot import lxml. Is it installed?")
+    @pytest.mark.skipif(lxml_import_failure, 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(lxml_import_failure, reason="Cannot import lxml. Is it installed?")
     def test_as_xml(self) -> None:
         import lxml.etree as etree