Skip to content

Commit a2e6ec6

Browse files
committed
Fix Python 2 unicode issue
1 parent d87eb63 commit a2e6ec6

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

pandas/tests/indexes/test_base.py

+15-9
Original file line numberDiff line numberDiff line change
@@ -1339,14 +1339,20 @@ def test_string_index_repr(self):
13391339
# py3/py2 repr can differ because of "u" prefix
13401340
# which also affects to displayed element size
13411341

1342+
# suppress flake8 warnings
1343+
if PY3:
1344+
coerce = lambda x: x
1345+
else:
1346+
coerce = unicode
1347+
13421348
# short
13431349
idx = pd.Index(['a', 'bb', 'ccc'])
13441350
if PY3:
13451351
expected = u"""Index(['a', 'bb', 'ccc'], dtype='object')"""
13461352
self.assertEqual(repr(idx), expected)
13471353
else:
13481354
expected = u"""Index([u'a', u'bb', u'ccc'], dtype='object')"""
1349-
self.assertEqual(u(idx), expected)
1355+
self.assertEqual(coerce(idx), expected)
13501356

13511357
# multiple lines
13521358
idx = pd.Index(['a', 'bb', 'ccc'] * 10)
@@ -1365,7 +1371,7 @@ def test_string_index_repr(self):
13651371
u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc'],
13661372
dtype='object')"""
13671373

1368-
self.assertEqual(u(idx), expected)
1374+
self.assertEqual(coerce(idx), expected)
13691375

13701376
# truncated
13711377
idx = pd.Index(['a', 'bb', 'ccc'] * 100)
@@ -1384,7 +1390,7 @@ def test_string_index_repr(self):
13841390
u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc'],
13851391
dtype='object', length=300)"""
13861392

1387-
self.assertEqual(u(idx), expected)
1393+
self.assertEqual(coerce(idx), expected)
13881394

13891395
# short
13901396
idx = pd.Index([u'あ', u'いい', u'ううう'])
@@ -1394,7 +1400,7 @@ def test_string_index_repr(self):
13941400
else:
13951401
expected = u"""\
13961402
Index([u'あ', u'いい', u'ううう'], dtype='object')"""
1397-
self.assertEqual(u(idx), expected)
1403+
self.assertEqual(coerce(idx), expected)
13981404

13991405
# multiple lines
14001406
idx = pd.Index([u'あ', u'いい', u'ううう'] * 10)
@@ -1411,7 +1417,7 @@ def test_string_index_repr(self):
14111417
u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう'],
14121418
dtype='object')"""
14131419

1414-
self.assertEqual(u(idx), expected)
1420+
self.assertEqual(coerce(idx), expected)
14151421

14161422
# truncated
14171423
idx = pd.Index([u'あ', u'いい', u'ううう'] * 100)
@@ -1428,7 +1434,7 @@ def test_string_index_repr(self):
14281434
u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう'],
14291435
dtype='object', length=300)"""
14301436

1431-
self.assertEqual(u(idx), expected)
1437+
self.assertEqual(coerce(idx), expected)
14321438

14331439
# Emable Unicode option -----------------------------------------
14341440
with cf.option_context('display.unicode.east_asian_width', True):
@@ -1440,7 +1446,7 @@ def test_string_index_repr(self):
14401446
self.assertEqual(repr(idx), expected)
14411447
else:
14421448
expected = u"""Index([u'あ', u'いい', u'ううう'], dtype='object')"""
1443-
self.assertEqual(u(idx), expected)
1449+
self.assertEqual(coerce(idx), expected)
14441450

14451451
# multiple lines
14461452
idx = pd.Index([u'あ', u'いい', u'ううう'] * 10)
@@ -1459,7 +1465,7 @@ def test_string_index_repr(self):
14591465
u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう'],
14601466
dtype='object')"""
14611467

1462-
self.assertEqual(u(idx), expected)
1468+
self.assertEqual(coerce(idx), expected)
14631469

14641470
# truncated
14651471
idx = pd.Index([u'あ', u'いい', u'ううう'] * 100)
@@ -1480,7 +1486,7 @@ def test_string_index_repr(self):
14801486
u'いい', u'ううう'],
14811487
dtype='object', length=300)"""
14821488

1483-
self.assertEqual(u(idx), expected)
1489+
self.assertEqual(coerce(idx), expected)
14841490

14851491

14861492
def test_get_combined_index():

0 commit comments

Comments
 (0)