Merge master into features

Conflicts: src/_pytest/debugging.py
2019-11-06 14:22:07 +01:00
parent 92b436c938 5f9db8a017
commit 4e45472405
18 changed files with 79 additions and 36 deletions
--- a/src/_pytest/assertion/util.py
+++ b/src/_pytest/assertion/util.py
@@ -38,7 +38,6 @@ def format_explanation(explanation: str) -> str:
    for when one explanation needs to span multiple lines, e.g. when
    displaying diffs.
    """
-    explanation = explanation
    lines = _split_explanation(explanation)
    result = _format_lines(lines)
    return "\n".join(result)