@@ -1339,14 +1339,20 @@ def test_string_index_repr(self):
1339
1339
# py3/py2 repr can differ because of "u" prefix
1340
1340
# which also affects to displayed element size
1341
1341
1342
+ # suppress flake8 warnings
1343
+ if PY3 :
1344
+ coerce = lambda x : x
1345
+ else :
1346
+ coerce = unicode
1347
+
1342
1348
# short
1343
1349
idx = pd .Index (['a' , 'bb' , 'ccc' ])
1344
1350
if PY3 :
1345
1351
expected = u"""Index(['a', 'bb', 'ccc'], dtype='object')"""
1346
1352
self .assertEqual (repr (idx ), expected )
1347
1353
else :
1348
1354
expected = u"""Index([u'a', u'bb', u'ccc'], dtype='object')"""
1349
- self .assertEqual (u (idx ), expected )
1355
+ self .assertEqual (coerce (idx ), expected )
1350
1356
1351
1357
# multiple lines
1352
1358
idx = pd .Index (['a' , 'bb' , 'ccc' ] * 10 )
@@ -1365,7 +1371,7 @@ def test_string_index_repr(self):
1365
1371
u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc'],
1366
1372
dtype='object')"""
1367
1373
1368
- self .assertEqual (u (idx ), expected )
1374
+ self .assertEqual (coerce (idx ), expected )
1369
1375
1370
1376
# truncated
1371
1377
idx = pd .Index (['a' , 'bb' , 'ccc' ] * 100 )
@@ -1384,7 +1390,7 @@ def test_string_index_repr(self):
1384
1390
u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc'],
1385
1391
dtype='object', length=300)"""
1386
1392
1387
- self .assertEqual (u (idx ), expected )
1393
+ self .assertEqual (coerce (idx ), expected )
1388
1394
1389
1395
# short
1390
1396
idx = pd .Index ([u'あ' , u'いい' , u'ううう' ])
@@ -1394,7 +1400,7 @@ def test_string_index_repr(self):
1394
1400
else :
1395
1401
expected = u"""\
1396
1402
Index([u'あ', u'いい', u'ううう'], dtype='object')"""
1397
- self .assertEqual (u (idx ), expected )
1403
+ self .assertEqual (coerce (idx ), expected )
1398
1404
1399
1405
# multiple lines
1400
1406
idx = pd .Index ([u'あ' , u'いい' , u'ううう' ] * 10 )
@@ -1411,7 +1417,7 @@ def test_string_index_repr(self):
1411
1417
u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう'],
1412
1418
dtype='object')"""
1413
1419
1414
- self .assertEqual (u (idx ), expected )
1420
+ self .assertEqual (coerce (idx ), expected )
1415
1421
1416
1422
# truncated
1417
1423
idx = pd .Index ([u'あ' , u'いい' , u'ううう' ] * 100 )
@@ -1428,7 +1434,7 @@ def test_string_index_repr(self):
1428
1434
u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう'],
1429
1435
dtype='object', length=300)"""
1430
1436
1431
- self .assertEqual (u (idx ), expected )
1437
+ self .assertEqual (coerce (idx ), expected )
1432
1438
1433
1439
# Emable Unicode option -----------------------------------------
1434
1440
with cf .option_context ('display.unicode.east_asian_width' , True ):
@@ -1440,7 +1446,7 @@ def test_string_index_repr(self):
1440
1446
self .assertEqual (repr (idx ), expected )
1441
1447
else :
1442
1448
expected = u"""Index([u'あ', u'いい', u'ううう'], dtype='object')"""
1443
- self .assertEqual (u (idx ), expected )
1449
+ self .assertEqual (coerce (idx ), expected )
1444
1450
1445
1451
# multiple lines
1446
1452
idx = pd .Index ([u'あ' , u'いい' , u'ううう' ] * 10 )
@@ -1459,7 +1465,7 @@ def test_string_index_repr(self):
1459
1465
u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう'],
1460
1466
dtype='object')"""
1461
1467
1462
- self .assertEqual (u (idx ), expected )
1468
+ self .assertEqual (coerce (idx ), expected )
1463
1469
1464
1470
# truncated
1465
1471
idx = pd .Index ([u'あ' , u'いい' , u'ううう' ] * 100 )
@@ -1480,7 +1486,7 @@ def test_string_index_repr(self):
1480
1486
u'いい', u'ううう'],
1481
1487
dtype='object', length=300)"""
1482
1488
1483
- self .assertEqual (u (idx ), expected )
1489
+ self .assertEqual (coerce (idx ), expected )
1484
1490
1485
1491
1486
1492
def test_get_combined_index ():
0 commit comments