Merge branch 'master' into merge-master-into-features

Conflicts:
	appveyor.yml
	setup.py

src/_pytest/assertion/truncate.py

@@ -12,7 +12,6 @@ import os
 
 import six
 
-
 DEFAULT_MAX_LINES = 8
 DEFAULT_MAX_CHARS = 8 * 80
 USAGE_MSG = "use '-vv' to show"

src/_pytest/capture.py

@@ -17,6 +17,7 @@ from tempfile import TemporaryFile
 import six
 
 import pytest
+from _pytest.compat import _PY3
 from _pytest.compat import CaptureIO
 
 patchsysdict = {0: "stdin", 1: "stdout", 2: "stderr"}
@@ -412,6 +413,10 @@ class EncodedFile(object):
     def write(self, obj):
         if isinstance(obj, six.text_type):
             obj = obj.encode(self.encoding, "replace")
+        elif _PY3:
+            raise TypeError(
+                "write() argument must be str, not {}".format(type(obj).__name__)
+            )
         self.buffer.write(obj)
 
     def writelines(self, linelist):

src/_pytest/deprecated.py

@@ -16,7 +16,6 @@ from _pytest.warning_types import PytestDeprecationWarning
 from _pytest.warning_types import RemovedInPytest4Warning
 from _pytest.warning_types import UnformattedWarning
 
-
 YIELD_TESTS = "yield tests were removed in pytest 4.0 - {name} will be ignored"
 
 

src/_pytest/hookspec.py

@@ -3,7 +3,6 @@ from pluggy import HookspecMarker
 
 from _pytest.deprecated import PYTEST_LOGWARNING
 
-
 hookspec = HookspecMarker("pytest")
 
 # -------------------------------------------------------------------------

src/_pytest/logging.py

@@ -15,7 +15,6 @@ from _pytest.compat import dummy_context_manager
 from _pytest.config import create_terminal_writer
 from _pytest.pathlib import Path
 
-
 DEFAULT_LOG_FORMAT = "%(filename)-25s %(lineno)4d %(levelname)-8s %(message)s"
 DEFAULT_LOG_DATE_FORMAT = "%H:%M:%S"
 

src/_pytest/main.py

@@ -24,7 +24,6 @@ from _pytest.deprecated import PYTEST_CONFIG_GLOBAL
 from _pytest.outcomes import exit
 from _pytest.runner import collect_one_node
 
-
 # exitcodes for the command line
 EXIT_OK = 0
 EXIT_TESTSFAILED = 1

src/_pytest/mark/structures.py

@@ -12,7 +12,6 @@ from ..compat import MappingMixin
 from ..compat import NOTSET
 from _pytest.outcomes import fail
 
-
 EMPTY_PARAMETERSET_OPTION = "empty_parameter_set_mark"
 
 

src/_pytest/pathlib.py

@@ -19,7 +19,6 @@ from six.moves import map
 
 from .compat import PY36
 
-
 if PY36:
     from pathlib import Path, PurePath
 else: