Merge remote-tracking branch 'upstream/master' into mm

Conflicts:
 * 	src/_pytest/_code/code.py
 * 	src/_pytest/main.py
 * 	testing/python/metafunc.py
 * 	testing/test_parseopt.py
 * 	testing/test_pytester.py

1 files changed, 3 insertions, 1 deletions

diff --git a/src/_pytest/doctest.py b/src/_pytest/doctest.py
index 30eaba035..4714b2c1d 100644
--- a/src/_pytest/doctest.py
+++ b/src/_pytest/doctest.py
@@ -13,6 +13,8 @@ from typing import Sequence
 from typing import Tuple
 from typing import Union
 
+import py
+
 import pytest
 from _pytest import outcomes
 from _pytest._code.code import ExceptionInfo
@@ -137,7 +139,7 @@ class ReprFailDoctest(TerminalRepr):
     ):
         self.reprlocation_lines = reprlocation_lines
 
-    def toterminal(self, tw) -> None:
+    def toterminal(self, tw: py.io.TerminalWriter) -> None:
         for reprlocation, lines in self.reprlocation_lines:
             for line in lines:
                 tw.line(line)