Merge master into features

Conflicts:
	.github/workflows/main.yml

1 files changed, 2 insertions, 1 deletions

diff --git a/src/_pytest/doctest.py b/src/_pytest/doctest.py
index 3475ac9c2..30eaba035 100644
--- a/src/_pytest/doctest.py
+++ b/src/_pytest/doctest.py
@@ -19,12 +19,13 @@ from _pytest._code.code import ExceptionInfo
 from _pytest._code.code import ReprFileLocation
 from _pytest._code.code import TerminalRepr
 from _pytest.compat import safe_getattr
+from _pytest.compat import TYPE_CHECKING
 from _pytest.fixtures import FixtureRequest
 from _pytest.outcomes import Skipped
 from _pytest.python_api import approx
 from _pytest.warning_types import PytestWarning
 
-if False:  # TYPE_CHECKING
+if TYPE_CHECKING:
     import doctest
     from typing import Type