Skip to content

Commit c174c3d

Browse files
committed
Merge pull request #6386 from bwignall/assert_6175_newAsserts_3
CLN: Change assert_(a is [not] None) to specialized forms
2 parents ac25441 + 9800989 commit c174c3d

17 files changed

+86
-86
lines changed

pandas/io/tests/test_parsers.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ def test_no_unnamed_index(self):
14801480
2 2 2 e f
14811481
"""
14821482
df = self.read_table(StringIO(data), sep=' ')
1483-
self.assert_(df.index.name is None)
1483+
self.assertIsNone(df.index.name)
14841484

14851485
def test_converters(self):
14861486
data = """A,B,C,D
@@ -2177,7 +2177,7 @@ def test_regex_separator(self):
21772177
df = self.read_table(StringIO(data), sep='\s+')
21782178
expected = self.read_csv(StringIO(re.sub('[ ]+', ',', data)),
21792179
index_col=0)
2180-
self.assert_(expected.index.name is None)
2180+
self.assertIsNone(expected.index.name)
21812181
tm.assert_frame_equal(df, expected)
21822182

21832183
def test_1000_fwf(self):

pandas/io/tests/test_pytables.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -777,12 +777,12 @@ def test_append_series(self):
777777
store.append('ss', ss)
778778
result = store['ss']
779779
tm.assert_series_equal(result, ss)
780-
self.assert_(result.name is None)
780+
self.assertIsNone(result.name)
781781

782782
store.append('ts', ts)
783783
result = store['ts']
784784
tm.assert_series_equal(result, ts)
785-
self.assert_(result.name is None)
785+
self.assertIsNone(result.name)
786786

787787
ns.name = 'foo'
788788
store.append('ns', ns)
@@ -3257,7 +3257,7 @@ def test_retain_index_attributes(self):
32573257
index=date_range('2002-1-1',periods=3,freq='D'))))
32583258
store.append('data',df2)
32593259

3260-
self.assert_(store.get_storer('data').info['index']['freq'] is None)
3260+
self.assertIsNone(store.get_storer('data').info['index']['freq'])
32613261

32623262
# this is ok
32633263
_maybe_remove(store,'df2')
@@ -3292,7 +3292,7 @@ def test_retain_index_attributes2(self):
32923292
df2 = DataFrame(dict(A = Series(lrange(3), index=idx2)))
32933293
df2.to_hdf(path,'data',append=True)
32943294

3295-
self.assert_(read_hdf(path,'data').index.name is None)
3295+
self.assertIsNone(read_hdf(path,'data').index.name)
32963296

32973297
def test_panel_select(self):
32983298

pandas/sparse/tests/test_sparse.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def _check_getitem(sp, dense):
360360

361361
def test_get_get_value(self):
362362
assert_almost_equal(self.bseries.get(10), self.bseries[10])
363-
self.assert_(self.bseries.get(len(self.bseries) + 1) is None)
363+
self.assertIsNone(self.bseries.get(len(self.bseries) + 1))
364364

365365
dt = self.btseries.index[10]
366366
result = self.btseries.get(dt)

pandas/tests/test_format.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ def test_to_string(self):
979979

980980
buf = StringIO()
981981
retval = biggie.to_string(buf=buf)
982-
self.assert_(retval is None)
982+
self.assertIsNone(retval)
983983
self.assertEqual(buf.getvalue(), s)
984984

985985
tm.assert_isinstance(s, compat.string_types)
@@ -1208,7 +1208,7 @@ def test_to_html(self):
12081208

12091209
buf = StringIO()
12101210
retval = biggie.to_html(buf=buf)
1211-
self.assert_(retval is None)
1211+
self.assertIsNone(retval)
12121212
self.assertEqual(buf.getvalue(), s)
12131213

12141214
tm.assert_isinstance(s, compat.string_types)
@@ -1574,7 +1574,7 @@ def get_ipython():
15741574
{'parent_appname': 'ipython-qtconsole'}}}
15751575

15761576
repstr = self.frame._repr_html_()
1577-
self.assert_(repstr is not None)
1577+
self.assertIsNotNone(repstr)
15781578

15791579
fmt.set_option('display.max_rows', 5, 'display.max_columns', 2)
15801580
repstr = self.frame._repr_html_()
@@ -1807,7 +1807,7 @@ def test_to_string(self):
18071807
s = self.ts.to_string()
18081808

18091809
retval = self.ts.to_string(buf=buf)
1810-
self.assert_(retval is None)
1810+
self.assertIsNone(retval)
18111811
self.assertEqual(buf.getvalue().strip(), s)
18121812

18131813
# pass float_format

pandas/tests/test_frame.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def test_getitem(self):
117117
self.assert_(tm.equalContents(series.index, sl.index))
118118

119119
for key, _ in compat.iteritems(self.frame._series):
120-
self.assert_(self.frame[key] is not None)
120+
self.assertIsNotNone(self.frame[key])
121121

122122
self.assertNotIn('random', self.frame)
123123
with assertRaisesRegexp(KeyError, 'no item named random'):
@@ -144,14 +144,14 @@ def test_get(self):
144144
b = self.frame.get('B')
145145
assert_series_equal(b, self.frame['B'])
146146

147-
self.assert_(self.frame.get('foo') is None)
147+
self.assertIsNone(self.frame.get('foo'))
148148
assert_series_equal(self.frame.get('foo', self.frame['B']),
149149
self.frame['B'])
150150
# None
151151
# GH 5652
152152
for df in [DataFrame(), DataFrame(columns=list('AB')), DataFrame(columns=list('AB'),index=range(3)) ]:
153153
result = df.get(None)
154-
self.assert_(result is None)
154+
self.assertIsNone(result)
155155

156156
def test_getitem_iterator(self):
157157
idx = iter(['A', 'B', 'C'])
@@ -614,15 +614,15 @@ def test_setitem_ambig(self):
614614

615615
dm[0] = np.ones(3)
616616
self.assertEqual(len(dm.columns), 3)
617-
# self.assert_(dm.objects is None)
617+
# self.assertIsNone(dm.objects)
618618

619619
dm[1] = coercable_series
620620
self.assertEqual(len(dm.columns), 3)
621-
# self.assert_(dm.objects is None)
621+
# self.assertIsNone(dm.objects)
622622

623623
dm[2] = uncoercable_series
624624
self.assertEqual(len(dm.columns), 3)
625-
# self.assert_(dm.objects is not None)
625+
# self.assertIsNotNone(dm.objects)
626626
self.assertEqual(dm[2].dtype, np.object_)
627627

628628
def test_setitem_clear_caches(self):
@@ -1761,7 +1761,7 @@ def test_copy_index_name_checking(self):
17611761
ind.name = None
17621762
cp = self.frame.copy()
17631763
getattr(cp, attr).name = 'foo'
1764-
self.assert_(getattr(self.frame, attr).name is None)
1764+
self.assertIsNone(getattr(self.frame, attr).name)
17651765

17661766
def test_getitem_pop_assign_name(self):
17671767
s = self.frame['A']
@@ -2174,7 +2174,7 @@ def test_constructor_dtype_nocast_view(self):
21742174
def test_constructor_dtype_list_data(self):
21752175
df = DataFrame([[1, '2'],
21762176
[None, 'a']], dtype=object)
2177-
self.assert_(df.ix[1, 0] is None)
2177+
self.assertIsNone(df.ix[1, 0])
21782178
self.assertEqual(df.ix[0, 1], '2')
21792179

21802180
def test_constructor_list_frames(self):
@@ -3606,7 +3606,7 @@ def test_new_empty_index(self):
36063606
df1 = DataFrame(randn(0, 3))
36073607
df2 = DataFrame(randn(0, 3))
36083608
df1.index.name = 'foo'
3609-
self.assert_(df2.index.name is None)
3609+
self.assertIsNone(df2.index.name)
36103610

36113611
def test_astype(self):
36123612
casted = self.frame.astype(int)

pandas/tests/test_generic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def check_metadata(self, x, y=None):
227227
for m in x._metadata:
228228
v = getattr(x,m,None)
229229
if y is None:
230-
self.assert_(v is None)
230+
self.assertIsNone(v)
231231
else:
232232
self.assertEqual(v, getattr(y,m,None))
233233

pandas/tests/test_graphics.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ def test_subplots(self):
524524
axes = df.plot(subplots=True, sharex=True, legend=True)
525525

526526
for ax in axes:
527-
self.assert_(ax.get_legend() is not None)
527+
self.assertIsNotNone(ax.get_legend())
528528

529529
axes = df.plot(subplots=True, sharex=True)
530530
for ax in axes[:-2]:
@@ -649,7 +649,7 @@ def test_kde(self):
649649
_check_plot_works(df.plot, kind='kde')
650650
_check_plot_works(df.plot, kind='kde', subplots=True)
651651
ax = df.plot(kind='kde')
652-
self.assert_(ax.get_legend() is not None)
652+
self.assertIsNotNone(ax.get_legend())
653653
axes = df.plot(kind='kde', logy=True, subplots=True)
654654
for ax in axes:
655655
self.assertEqual(ax.get_yscale(), 'log')

pandas/tests/test_groupby.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2397,7 +2397,7 @@ def test_no_nonsense_name(self):
23972397
s.name = None
23982398

23992399
result = s.groupby(self.frame['A']).agg(np.sum)
2400-
self.assert_(result.name is None)
2400+
self.assertIsNone(result.name)
24012401

24022402
def test_wrap_agg_out(self):
24032403
grouped = self.three_group.groupby(['A', 'B'])
@@ -2575,7 +2575,7 @@ def test_no_dummy_key_names(self):
25752575
# GH #1291
25762576

25772577
result = self.df.groupby(self.df['A'].values).sum()
2578-
self.assert_(result.index.name is None)
2578+
self.assertIsNone(result.index.name)
25792579

25802580
result = self.df.groupby([self.df['A'].values,
25812581
self.df['B'].values]).sum()

pandas/tests/test_index.py

+18-18
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def test_set_name_methods(self):
7171
self.assertEqual(ind.name, original_name)
7272
res = ind.rename(new_name, inplace=True)
7373
# should return None
74-
self.assert_(res is None)
74+
self.assertIsNone(res)
7575
self.assertEqual(ind.name, new_name)
7676
self.assertEqual(ind.names, [new_name])
7777
with assertRaisesRegexp(TypeError, "list-like"):
@@ -385,7 +385,7 @@ def test_union(self):
385385

386386
second.name = 'B'
387387
union = first.union(second)
388-
self.assert_(union.name is None)
388+
self.assertIsNone(union.name)
389389

390390
def test_add(self):
391391
firstCat = self.strIndex + self.dateIndex
@@ -424,7 +424,7 @@ def test_append_empty_preserve_name(self):
424424
right = Index([1, 2, 3], name='bar')
425425

426426
result = left.append(right)
427-
self.assert_(result.name is None)
427+
self.assertIsNone(result.name)
428428

429429
def test_add_string(self):
430430
# from bug report
@@ -478,12 +478,12 @@ def test_symmetric_diff(self):
478478
result = idx1.sym_diff(idx2)
479479
expected = Index([1, 5])
480480
self.assert_(tm.equalContents(result, expected))
481-
self.assert_(result.name is None)
481+
self.assertIsNone(result.name)
482482

483483
# __xor__ syntax
484484
expected = idx1 ^ idx2
485485
self.assert_(tm.equalContents(result, expected))
486-
self.assert_(result.name is None)
486+
self.assertIsNone(result.name)
487487

488488
# multiIndex
489489
idx1 = MultiIndex.from_tuples(self.tuples)
@@ -597,7 +597,7 @@ def test_format_none(self):
597597

598598
idx = Index(values)
599599
idx.format()
600-
self.assert_(idx[3] is None)
600+
self.assertIsNone(idx[3])
601601

602602
def test_take(self):
603603
indexer = [4, 3, 0, 2]
@@ -1056,7 +1056,7 @@ def test_join_left(self):
10561056

10571057
tm.assert_isinstance(res, Int64Index)
10581058
self.assert_(res.equals(eres))
1059-
self.assert_(lidx is None)
1059+
self.assertIsNone(lidx)
10601060
self.assert_numpy_array_equal(ridx, eridx)
10611061

10621062
# monotonic
@@ -1066,7 +1066,7 @@ def test_join_left(self):
10661066
dtype=np.int64)
10671067
tm.assert_isinstance(res, Int64Index)
10681068
self.assert_(res.equals(eres))
1069-
self.assert_(lidx is None)
1069+
self.assertIsNone(lidx)
10701070
self.assert_numpy_array_equal(ridx, eridx)
10711071

10721072
# non-unique
@@ -1096,7 +1096,7 @@ def test_join_right(self):
10961096
tm.assert_isinstance(other, Int64Index)
10971097
self.assert_(res.equals(eres))
10981098
self.assert_numpy_array_equal(lidx, elidx)
1099-
self.assert_(ridx is None)
1099+
self.assertIsNone(ridx)
11001100

11011101
# monotonic
11021102
res, lidx, ridx = self.index.join(other_mono, how='right',
@@ -1107,7 +1107,7 @@ def test_join_right(self):
11071107
tm.assert_isinstance(other, Int64Index)
11081108
self.assert_(res.equals(eres))
11091109
self.assert_numpy_array_equal(lidx, elidx)
1110-
self.assert_(ridx is None)
1110+
self.assertIsNone(ridx)
11111111

11121112
# non-unique
11131113
"""
@@ -1303,7 +1303,7 @@ def test_set_names_and_rename(self):
13031303
ind.set_names(new_names + new_names)
13041304
new_names2 = [name + "SUFFIX2" for name in new_names]
13051305
res = ind.set_names(new_names2, inplace=True)
1306-
self.assert_(res is None)
1306+
self.assertIsNone(res)
13071307
self.assertEqual(ind.names, new_names2)
13081308

13091309
def test_set_levels_and_set_labels(self):
@@ -1333,7 +1333,7 @@ def assert_matching(actual, expected):
13331333
# level changing [w/ mutation]
13341334
ind2 = self.index.copy()
13351335
inplace_return = ind2.set_levels(new_levels, inplace=True)
1336-
self.assert_(inplace_return is None)
1336+
self.assertIsNone(inplace_return)
13371337
assert_matching(ind2.levels, new_levels)
13381338

13391339
# label changing [w/o mutation]
@@ -1344,7 +1344,7 @@ def assert_matching(actual, expected):
13441344
# label changing [w/ mutation]
13451345
ind2 = self.index.copy()
13461346
inplace_return = ind2.set_labels(new_labels, inplace=True)
1347-
self.assert_(inplace_return is None)
1347+
self.assertIsNone(inplace_return)
13481348
assert_matching(ind2.labels, new_labels)
13491349

13501350
def test_set_levels_labels_names_bad_input(self):
@@ -1450,10 +1450,10 @@ def test_set_value_keeps_names(self):
14501450
columns=['one', 'two', 'three', 'four'],
14511451
index=idx)
14521452
df = df.sortlevel()
1453-
self.assert_(df.is_copy is None)
1453+
self.assertIsNone(df.is_copy)
14541454
self.assertEqual(df.index.names, ('Name', 'Number'))
14551455
df = df.set_value(('grethe', '4'), 'one', 99.34)
1456-
self.assert_(df.is_copy is None)
1456+
self.assertIsNone(df.is_copy)
14571457
self.assertEqual(df.index.names, ('Name', 'Number'))
14581458

14591459
def test_names(self):
@@ -1508,7 +1508,7 @@ def test_constructor_single_level(self):
15081508

15091509
single_level = MultiIndex(levels=[['foo', 'bar', 'baz', 'qux']],
15101510
labels=[[0, 1, 2, 3]])
1511-
self.assert_(single_level.name is None)
1511+
self.assertIsNone(single_level.name)
15121512

15131513
def test_constructor_no_levels(self):
15141514
assertRaisesRegexp(ValueError, "non-zero number of levels/labels",
@@ -1850,7 +1850,7 @@ def test_get_loc_level(self):
18501850
loc, new_index = index.get_loc_level((0, 1, 0))
18511851
expected = 1
18521852
self.assertEqual(loc, expected)
1853-
self.assert_(new_index is None)
1853+
self.assertIsNone(new_index)
18541854

18551855
self.assertRaises(KeyError, index.get_loc_level, (2, 2))
18561856

@@ -2499,7 +2499,7 @@ def test_reindex(self):
24992499

25002500
result, indexer = self.index.reindex(list(self.index))
25012501
tm.assert_isinstance(result, MultiIndex)
2502-
self.assert_(indexer is None)
2502+
self.assertIsNone(indexer)
25032503
self.check_level_names(result, self.index.names)
25042504

25052505
def test_reindex_level(self):

0 commit comments

Comments
 (0)