Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2018-10-13 08:50:32 -03:00
parent 933de16fe4 eabf15b626
commit 29d5849519
20 changed files with 47 additions and 51 deletions
--- a/src/_pytest/compat.py
+++ b/src/_pytest/compat.py
@@ -268,7 +268,7 @@ def get_real_func(obj):
        obj = new_obj
    else:
        raise ValueError(
-            ("could not find real function of {start}" "\nstopped at {current}").format(
+            ("could not find real function of {start}\nstopped at {current}").format(
                start=py.io.saferepr(start_obj), current=py.io.saferepr(obj)
            )
        )