@@ -71,7 +71,7 @@ def test_set_name_methods(self):
71
71
self .assertEqual (ind .name , original_name )
72
72
res = ind .rename (new_name , inplace = True )
73
73
# should return None
74
- self .assert_ (res is None )
74
+ self .assertIsNone (res )
75
75
self .assertEqual (ind .name , new_name )
76
76
self .assertEqual (ind .names , [new_name ])
77
77
with assertRaisesRegexp (TypeError , "list-like" ):
@@ -385,7 +385,7 @@ def test_union(self):
385
385
386
386
second .name = 'B'
387
387
union = first .union (second )
388
- self .assert_ (union .name is None )
388
+ self .assertIsNone (union .name )
389
389
390
390
def test_add (self ):
391
391
firstCat = self .strIndex + self .dateIndex
@@ -424,7 +424,7 @@ def test_append_empty_preserve_name(self):
424
424
right = Index ([1 , 2 , 3 ], name = 'bar' )
425
425
426
426
result = left .append (right )
427
- self .assert_ (result .name is None )
427
+ self .assertIsNone (result .name )
428
428
429
429
def test_add_string (self ):
430
430
# from bug report
@@ -478,12 +478,12 @@ def test_symmetric_diff(self):
478
478
result = idx1 .sym_diff (idx2 )
479
479
expected = Index ([1 , 5 ])
480
480
self .assert_ (tm .equalContents (result , expected ))
481
- self .assert_ (result .name is None )
481
+ self .assertIsNone (result .name )
482
482
483
483
# __xor__ syntax
484
484
expected = idx1 ^ idx2
485
485
self .assert_ (tm .equalContents (result , expected ))
486
- self .assert_ (result .name is None )
486
+ self .assertIsNone (result .name )
487
487
488
488
# multiIndex
489
489
idx1 = MultiIndex .from_tuples (self .tuples )
@@ -597,7 +597,7 @@ def test_format_none(self):
597
597
598
598
idx = Index (values )
599
599
idx .format ()
600
- self .assert_ (idx [3 ] is None )
600
+ self .assertIsNone (idx [3 ])
601
601
602
602
def test_take (self ):
603
603
indexer = [4 , 3 , 0 , 2 ]
@@ -1056,7 +1056,7 @@ def test_join_left(self):
1056
1056
1057
1057
tm .assert_isinstance (res , Int64Index )
1058
1058
self .assert_ (res .equals (eres ))
1059
- self .assert_ (lidx is None )
1059
+ self .assertIsNone (lidx )
1060
1060
self .assert_numpy_array_equal (ridx , eridx )
1061
1061
1062
1062
# monotonic
@@ -1066,7 +1066,7 @@ def test_join_left(self):
1066
1066
dtype = np .int64 )
1067
1067
tm .assert_isinstance (res , Int64Index )
1068
1068
self .assert_ (res .equals (eres ))
1069
- self .assert_ (lidx is None )
1069
+ self .assertIsNone (lidx )
1070
1070
self .assert_numpy_array_equal (ridx , eridx )
1071
1071
1072
1072
# non-unique
@@ -1096,7 +1096,7 @@ def test_join_right(self):
1096
1096
tm .assert_isinstance (other , Int64Index )
1097
1097
self .assert_ (res .equals (eres ))
1098
1098
self .assert_numpy_array_equal (lidx , elidx )
1099
- self .assert_ (ridx is None )
1099
+ self .assertIsNone (ridx )
1100
1100
1101
1101
# monotonic
1102
1102
res , lidx , ridx = self .index .join (other_mono , how = 'right' ,
@@ -1107,7 +1107,7 @@ def test_join_right(self):
1107
1107
tm .assert_isinstance (other , Int64Index )
1108
1108
self .assert_ (res .equals (eres ))
1109
1109
self .assert_numpy_array_equal (lidx , elidx )
1110
- self .assert_ (ridx is None )
1110
+ self .assertIsNone (ridx )
1111
1111
1112
1112
# non-unique
1113
1113
"""
@@ -1303,7 +1303,7 @@ def test_set_names_and_rename(self):
1303
1303
ind .set_names (new_names + new_names )
1304
1304
new_names2 = [name + "SUFFIX2" for name in new_names ]
1305
1305
res = ind .set_names (new_names2 , inplace = True )
1306
- self .assert_ (res is None )
1306
+ self .assertIsNone (res )
1307
1307
self .assertEqual (ind .names , new_names2 )
1308
1308
1309
1309
def test_set_levels_and_set_labels (self ):
@@ -1333,7 +1333,7 @@ def assert_matching(actual, expected):
1333
1333
# level changing [w/ mutation]
1334
1334
ind2 = self .index .copy ()
1335
1335
inplace_return = ind2 .set_levels (new_levels , inplace = True )
1336
- self .assert_ (inplace_return is None )
1336
+ self .assertIsNone (inplace_return )
1337
1337
assert_matching (ind2 .levels , new_levels )
1338
1338
1339
1339
# label changing [w/o mutation]
@@ -1344,7 +1344,7 @@ def assert_matching(actual, expected):
1344
1344
# label changing [w/ mutation]
1345
1345
ind2 = self .index .copy ()
1346
1346
inplace_return = ind2 .set_labels (new_labels , inplace = True )
1347
- self .assert_ (inplace_return is None )
1347
+ self .assertIsNone (inplace_return )
1348
1348
assert_matching (ind2 .labels , new_labels )
1349
1349
1350
1350
def test_set_levels_labels_names_bad_input (self ):
@@ -1450,10 +1450,10 @@ def test_set_value_keeps_names(self):
1450
1450
columns = ['one' , 'two' , 'three' , 'four' ],
1451
1451
index = idx )
1452
1452
df = df .sortlevel ()
1453
- self .assert_ (df .is_copy is None )
1453
+ self .assertIsNone (df .is_copy )
1454
1454
self .assertEqual (df .index .names , ('Name' , 'Number' ))
1455
1455
df = df .set_value (('grethe' , '4' ), 'one' , 99.34 )
1456
- self .assert_ (df .is_copy is None )
1456
+ self .assertIsNone (df .is_copy )
1457
1457
self .assertEqual (df .index .names , ('Name' , 'Number' ))
1458
1458
1459
1459
def test_names (self ):
@@ -1508,7 +1508,7 @@ def test_constructor_single_level(self):
1508
1508
1509
1509
single_level = MultiIndex (levels = [['foo' , 'bar' , 'baz' , 'qux' ]],
1510
1510
labels = [[0 , 1 , 2 , 3 ]])
1511
- self .assert_ (single_level .name is None )
1511
+ self .assertIsNone (single_level .name )
1512
1512
1513
1513
def test_constructor_no_levels (self ):
1514
1514
assertRaisesRegexp (ValueError , "non-zero number of levels/labels" ,
@@ -1850,7 +1850,7 @@ def test_get_loc_level(self):
1850
1850
loc , new_index = index .get_loc_level ((0 , 1 , 0 ))
1851
1851
expected = 1
1852
1852
self .assertEqual (loc , expected )
1853
- self .assert_ (new_index is None )
1853
+ self .assertIsNone (new_index )
1854
1854
1855
1855
self .assertRaises (KeyError , index .get_loc_level , (2 , 2 ))
1856
1856
@@ -2499,7 +2499,7 @@ def test_reindex(self):
2499
2499
2500
2500
result , indexer = self .index .reindex (list (self .index ))
2501
2501
tm .assert_isinstance (result , MultiIndex )
2502
- self .assert_ (indexer is None )
2502
+ self .assertIsNone (indexer )
2503
2503
self .check_level_names (result , self .index .names )
2504
2504
2505
2505
def test_reindex_level (self ):
0 commit comments