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

2017-09-05 19:44:33 -03:00
parent d1f71b0575 181bd60bf9
commit f825b4979b
42 changed files with 398 additions and 132 deletions
--- a/_pytest/_code/code.py
+++ b/_pytest/_code/code.py
@@ -861,7 +861,7 @@ class ReprFuncArgs(TerminalRepr):
        if self.args:
            linesofar = ""
            for name, value in self.args:
-                ns = "%s = %s" % (name, value)
+                ns = "%s = %s" % (safe_str(name), safe_str(value))
                if len(ns) + len(linesofar) + 2 > tw.fullwidth:
                    if linesofar:
                        tw.line(linesofar)