From 59cdef92beebc9054a1c366afc27e079116af1b6 Mon Sep 17 00:00:00 2001 From: Fernando Macedo Date: Wed, 30 Aug 2017 16:06:12 -0300 Subject: fixes #2731 ReprFuncArgs with mixed unicode and utf-8 args --- testing/code/test_code.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'testing') 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' -- cgit v1.2.3