From 59cdef92beebc9054a1c366afc27e079116af1b6 Mon Sep 17 00:00:00 2001
From: Fernando Macedo <fgmacedo@gmail.com>
Date: Wed, 30 Aug 2017 16:06:12 -0300
Subject: [PATCH] fixes #2731 ReprFuncArgs with mixed unicode and utf-8 args

---
 _pytest/_code/code.py     |  2 +-
 changelog/2731.bugfix     |  1 +
 testing/code/test_code.py | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 changelog/2731.bugfix

diff --git a/_pytest/_code/code.py b/_pytest/_code/code.py
index 0230c5660..cf10fb6bc 100644
--- a/_pytest/_code/code.py
+++ b/_pytest/_code/code.py
@@ -863,7 +863,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)
diff --git a/changelog/2731.bugfix b/changelog/2731.bugfix
new file mode 100644
index 000000000..493ea503b
--- /dev/null
+++ b/changelog/2731.bugfix
@@ -0,0 +1 @@
+Fix ``ReprFuncArgs`` with mixed unicode and UTF-8 args.
diff --git a/testing/code/test_code.py b/testing/code/test_code.py
index 6db5c6fbd..209a8ef19 100644
--- a/testing/code/test_code.py
+++ b/testing/code/test_code.py
@@ -1,9 +1,11 @@
+# coding: utf-8
 from __future__ import absolute_import, division, print_function
 import sys
 
 import _pytest._code
 import py
 import pytest
+from test_excinfo import TWMock
 
 
 def test_ne():
@@ -172,3 +174,23 @@ class TestTracebackEntry(object):
         source = entry.getsource()
         assert len(source) == 6
         assert 'assert False' in source[5]
+
+
+class TestReprFuncArgs(object):
+
+    def test_not_raise_exception_with_mixed_encoding(self):
+        from _pytest._code.code import ReprFuncArgs
+
+        tw = TWMock()
+
+        args = [
+            ('unicode_string', u"São Paulo"),
+            ('utf8_string', 'S\xc3\xa3o Paulo'),
+        ]
+
+        r = ReprFuncArgs(args)
+        r.toterminal(tw)
+        if sys.version_info[0] >= 3:
+            assert tw.lines[0] == 'unicode_string = São Paulo, utf8_string = São Paulo'
+        else:
+            assert tw.lines[0] == 'unicode_string = São Paulo, utf8_string = São Paulo'