Skip to content

Commit 51366f2

Browse files
committed
Encode in utf-8 only in python2
1 parent 6b087f2 commit 51366f2

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

pandas/util/testing.py

+10-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
is_interval_dtype,
3232
is_sequence,
3333
is_list_like)
34-
from pandas.io.formats.printing import pprint_thing_encoded
34+
from pandas.io.formats.printing import pprint_thing
3535
from pandas.core.algorithms import take_1d
3636
import pandas.core.common as com
3737

@@ -989,16 +989,21 @@ def assert_categorical_equal(left, right, check_dtype=True,
989989

990990
def raise_assert_detail(obj, message, left, right, diff=None):
991991
if isinstance(left, np.ndarray):
992-
left = pprint_thing_encoded(left,
993-
encoding=pd.options.display.encoding)
992+
left = pprint_thing(left)
994993
elif is_categorical_dtype(left):
995994
left = repr(left)
995+
996+
if compat.PY2 and isinstance(left, compat.string_types):
997+
left = left.encode('utf-8')
998+
996999
if isinstance(right, np.ndarray):
997-
right = pprint_thing_encoded(right,
998-
encoding=pd.options.display.encoding)
1000+
right = pprint_thing(right)
9991001
elif is_categorical_dtype(right):
10001002
right = repr(right)
10011003

1004+
if compat.PY2 and isinstance(right, compat.string_types):
1005+
right = right.encode('utf-8')
1006+
10021007
msg = """{obj} are different
10031008
10041009
{message}

0 commit comments

Comments
 (0)