tests: move tests for TerminalWriter (#429)

Author: blueyed

src/_pytest/doctest.py

@@ -19,7 +19,6 @@
 from _pytest._code.code import ExceptionInfo
 from _pytest._code.code import ReprFileLocation
 from _pytest._code.code import TerminalRepr
-from _pytest._io import TerminalWriter
 from _pytest.compat import safe_getattr
 from _pytest.compat import TYPE_CHECKING
 from _pytest.fixtures import FixtureRequest
@@ -31,6 +30,8 @@
     import doctest
     from typing import Type
 
+    from _pytest._io import TerminalWriter
+
 DOCTEST_REPORT_CHOICE_NONE = "none"
 DOCTEST_REPORT_CHOICE_CDIFF = "cdiff"
 DOCTEST_REPORT_CHOICE_NDIFF = "ndiff"
@@ -136,10 +137,10 @@ def _is_doctest(config, path, parent):
 class ReprFailDoctest(TerminalRepr):
     def __init__(
         self, reprlocation_lines: Sequence[Tuple[ReprFileLocation, Sequence[str]]]
-    ):
+    ) -> None:
         self.reprlocation_lines = reprlocation_lines
 
-    def toterminal(self, tw: TerminalWriter) -> None:
+    def toterminal(self, tw: "TerminalWriter") -> None:
         for reprlocation, lines in self.reprlocation_lines:
             for line in lines:
                 tw.line(line)

src/_pytest/fixtures.py

@@ -17,7 +17,6 @@
 from _pytest._code.code import FormattedExcinfo
 from _pytest._code.code import TerminalRepr
 from _pytest._code.source import getfslineno
-from _pytest._io import TerminalWriter
 from _pytest.compat import _format_args
 from _pytest.compat import _PytestWrapper
 from _pytest.compat import get_real_func
@@ -41,6 +40,7 @@
     from typing_extensions import Literal
 
     from _pytest import nodes
+    from _pytest._io import TerminalWriter
     from _pytest.main import Session
     from _pytest.runner import _RuntestPhase
 
@@ -776,7 +776,7 @@ def __init__(self, filename, firstlineno, tblines, errorstring, argname):
         self.firstlineno = firstlineno
         self.argname = argname
 
-    def toterminal(self, tw: TerminalWriter) -> None:
+    def toterminal(self, tw: "TerminalWriter") -> None:
         # tw.line("FixtureLookupError: %s" %(self.argname), red=True)
         for tbline in self.tblines:
             tw.line(tbline.rstrip())

src/_pytest/python.py

@@ -28,7 +28,6 @@
 from _pytest._code import filter_traceback
 from _pytest._code.code import ExceptionInfo
 from _pytest._code.source import getfslineno
-from _pytest._io import TerminalWriter
 from _pytest._io.saferepr import saferepr
 from _pytest.compat import ascii_escaped
 from _pytest.compat import get_default_arg_names
@@ -42,6 +41,7 @@
 from _pytest.compat import safe_getattr
 from _pytest.compat import safe_isclass
 from _pytest.compat import STRING_TYPES
+from _pytest.compat import TYPE_CHECKING
 from _pytest.config import Config
 from _pytest.config import hookimpl
 from _pytest.deprecated import FUNCARGNAMES
@@ -57,6 +57,9 @@
 from _pytest.warning_types import PytestCollectionWarning
 from _pytest.warning_types import PytestUnhandledCoroutineWarning
 
+if TYPE_CHECKING:
+    from _pytest._io import TerminalWriter
+
 
 def pyobj_property(name):
     def get(self):
@@ -1382,7 +1385,7 @@ def _showfixtures_main(config, session):
         tw.line()
 
 
-def write_docstring(tw: TerminalWriter, doc: str, indent: str = "    ") -> None:
+def write_docstring(tw: "TerminalWriter", doc: str, indent: str = "    ") -> None:
     for line in doc.split("\n"):
         tw.write(indent + line + "\n")