Skip to content

Commit 8c7b973

Browse files
gfyoungjreback
authored andcommitted
MAINT: Remove assertIsInstance from testing (#16081)
1 parent ff00b55 commit 8c7b973

File tree

89 files changed

+527
-532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+527
-532
lines changed

pandas/tests/dtypes/test_generic.py

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,22 @@ class TestABCClasses(tm.TestCase):
2020
sparse_array = pd.SparseArray(np.random.randn(10))
2121

2222
def test_abc_types(self):
23-
self.assertIsInstance(pd.Index(['a', 'b', 'c']), gt.ABCIndex)
24-
self.assertIsInstance(pd.Int64Index([1, 2, 3]), gt.ABCInt64Index)
25-
self.assertIsInstance(pd.UInt64Index([1, 2, 3]), gt.ABCUInt64Index)
26-
self.assertIsInstance(pd.Float64Index([1, 2, 3]), gt.ABCFloat64Index)
27-
self.assertIsInstance(self.multi_index, gt.ABCMultiIndex)
28-
self.assertIsInstance(self.datetime_index, gt.ABCDatetimeIndex)
29-
self.assertIsInstance(self.timedelta_index, gt.ABCTimedeltaIndex)
30-
self.assertIsInstance(self.period_index, gt.ABCPeriodIndex)
31-
self.assertIsInstance(self.categorical_df.index,
32-
gt.ABCCategoricalIndex)
33-
self.assertIsInstance(pd.Index(['a', 'b', 'c']), gt.ABCIndexClass)
34-
self.assertIsInstance(pd.Int64Index([1, 2, 3]), gt.ABCIndexClass)
35-
self.assertIsInstance(pd.Series([1, 2, 3]), gt.ABCSeries)
36-
self.assertIsInstance(self.df, gt.ABCDataFrame)
23+
assert isinstance(pd.Index(['a', 'b', 'c']), gt.ABCIndex)
24+
assert isinstance(pd.Int64Index([1, 2, 3]), gt.ABCInt64Index)
25+
assert isinstance(pd.UInt64Index([1, 2, 3]), gt.ABCUInt64Index)
26+
assert isinstance(pd.Float64Index([1, 2, 3]), gt.ABCFloat64Index)
27+
assert isinstance(self.multi_index, gt.ABCMultiIndex)
28+
assert isinstance(self.datetime_index, gt.ABCDatetimeIndex)
29+
assert isinstance(self.timedelta_index, gt.ABCTimedeltaIndex)
30+
assert isinstance(self.period_index, gt.ABCPeriodIndex)
31+
assert isinstance(self.categorical_df.index, gt.ABCCategoricalIndex)
32+
assert isinstance(pd.Index(['a', 'b', 'c']), gt.ABCIndexClass)
33+
assert isinstance(pd.Int64Index([1, 2, 3]), gt.ABCIndexClass)
34+
assert isinstance(pd.Series([1, 2, 3]), gt.ABCSeries)
35+
assert isinstance(self.df, gt.ABCDataFrame)
3736
with catch_warnings(record=True):
38-
self.assertIsInstance(self.df.to_panel(), gt.ABCPanel)
39-
self.assertIsInstance(self.sparse_series, gt.ABCSparseSeries)
40-
self.assertIsInstance(self.sparse_array, gt.ABCSparseArray)
41-
self.assertIsInstance(self.categorical, gt.ABCCategorical)
42-
self.assertIsInstance(pd.Period('2012', freq='A-DEC'), gt.ABCPeriod)
37+
assert isinstance(self.df.to_panel(), gt.ABCPanel)
38+
assert isinstance(self.sparse_series, gt.ABCSparseSeries)
39+
assert isinstance(self.sparse_array, gt.ABCSparseArray)
40+
assert isinstance(self.categorical, gt.ABCCategorical)
41+
assert isinstance(pd.Period('2012', freq='A-DEC'), gt.ABCPeriod)

pandas/tests/dtypes/test_missing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_isnull(self):
7676
for s in [tm.makeFloatSeries(), tm.makeStringSeries(),
7777
tm.makeObjectSeries(), tm.makeTimeSeries(),
7878
tm.makePeriodSeries()]:
79-
self.assertIsInstance(isnull(s), Series)
79+
assert isinstance(isnull(s), Series)
8080

8181
# frame
8282
for df in [tm.makeTimeDataFrame(), tm.makePeriodFrame(),

pandas/tests/frame/test_alter_axes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def test_set_index_cast_datetimeindex(self):
198198
'B': np.random.randn(1000)})
199199

200200
idf = df.set_index('A')
201-
tm.assertIsInstance(idf.index, pd.DatetimeIndex)
201+
assert isinstance(idf.index, pd.DatetimeIndex)
202202

203203
# don't cast a DatetimeIndex WITH a tz, leave as object
204204
# GH 6032
@@ -740,7 +740,7 @@ def test_reset_index_range(self):
740740
df = pd.DataFrame([[0, 0], [1, 1]], columns=['A', 'B'],
741741
index=RangeIndex(stop=2))
742742
result = df.reset_index()
743-
tm.assertIsInstance(result.index, RangeIndex)
743+
assert isinstance(result.index, RangeIndex)
744744
expected = pd.DataFrame([[0, 0, 0], [1, 1, 1]],
745745
columns=['index', 'A', 'B'],
746746
index=RangeIndex(stop=2))
@@ -809,7 +809,7 @@ def test_setitem(self):
809809

810810
df = DataFrame({'A': range(10)})
811811
s = pd.cut(df.A, 5)
812-
self.assertIsInstance(s.cat.categories, IntervalIndex)
812+
assert isinstance(s.cat.categories, IntervalIndex)
813813

814814
# B & D end up as Categoricals
815815
# the remainer are converted to in-line objects

pandas/tests/frame/test_analytics.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,10 +399,10 @@ def test_count(self):
399399
# corner case
400400
frame = DataFrame()
401401
ct1 = frame.count(1)
402-
tm.assertIsInstance(ct1, Series)
402+
assert isinstance(ct1, Series)
403403

404404
ct2 = frame.count(0)
405-
tm.assertIsInstance(ct2, Series)
405+
assert isinstance(ct2, Series)
406406

407407
# GH #423
408408
df = DataFrame(index=lrange(10))
@@ -711,11 +711,11 @@ def _check_stat_op(self, name, alternative, frame=None, has_skipna=True,
711711
df = DataFrame({'b': date_range('1/1/2001', periods=2)})
712712
_f = getattr(df, name)
713713
result = _f()
714-
self.assertIsInstance(result, Series)
714+
assert isinstance(result, Series)
715715

716716
df['a'] = lrange(len(df))
717717
result = getattr(df, name)()
718-
self.assertIsInstance(result, Series)
718+
assert isinstance(result, Series)
719719
self.assertTrue(len(result))
720720

721721
if has_skipna:
@@ -913,8 +913,8 @@ def test_operators_timedelta64(self):
913913
def test_sum_corner(self):
914914
axis0 = self.empty.sum(0)
915915
axis1 = self.empty.sum(1)
916-
tm.assertIsInstance(axis0, Series)
917-
tm.assertIsInstance(axis1, Series)
916+
assert isinstance(axis0, Series)
917+
assert isinstance(axis1, Series)
918918
self.assertEqual(len(axis0), 0)
919919
self.assertEqual(len(axis1), 0)
920920

pandas/tests/frame/test_api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def test_new_empty_index(self):
118118
def test_array_interface(self):
119119
with np.errstate(all='ignore'):
120120
result = np.sqrt(self.frame)
121-
tm.assertIsInstance(result, type(self.frame))
121+
assert isinstance(result, type(self.frame))
122122
self.assertIs(result.index, self.frame.index)
123123
self.assertIs(result.columns, self.frame.columns)
124124

@@ -174,7 +174,7 @@ def test_itertuples(self):
174174
'ints': lrange(5)}, columns=['floats', 'ints'])
175175

176176
for tup in df.itertuples(index=False):
177-
tm.assertIsInstance(tup[1], np.integer)
177+
assert isinstance(tup[1], np.integer)
178178

179179
df = DataFrame(data={"a": [1, 2, 3], "b": [4, 5, 6]})
180180
dfaa = df[['a', 'a']]
@@ -204,7 +204,7 @@ def test_itertuples(self):
204204
# will raise SyntaxError if trying to create namedtuple
205205
tup3 = next(df3.itertuples())
206206
self.assertFalse(hasattr(tup3, '_fields'))
207-
self.assertIsInstance(tup3, tuple)
207+
assert isinstance(tup3, tuple)
208208

209209
def test_len(self):
210210
self.assertEqual(len(self.frame), len(self.frame.index))

pandas/tests/frame/test_apply.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@ def _checkit(axis=0, raw=False):
187187
res = df.apply(f, axis=axis, raw=raw)
188188
if is_reduction:
189189
agg_axis = df._get_agg_axis(axis)
190-
tm.assertIsInstance(res, Series)
190+
assert isinstance(res, Series)
191191
self.assertIs(res.index, agg_axis)
192192
else:
193-
tm.assertIsInstance(res, DataFrame)
193+
assert isinstance(res, DataFrame)
194194

195195
_checkit()
196196
_checkit(axis=1)
@@ -204,7 +204,7 @@ def _checkit(axis=0, raw=False):
204204
_check(no_index, lambda x: x.mean())
205205

206206
result = no_cols.apply(lambda x: x.mean(), broadcast=True)
207-
tm.assertIsInstance(result, DataFrame)
207+
assert isinstance(result, DataFrame)
208208

209209
def test_apply_with_args_kwds(self):
210210
def add_some(x, howmuch=0):
@@ -357,7 +357,7 @@ def test_apply_multi_index(self):
357357
s.index = MultiIndex.from_arrays([['a', 'a', 'b'], ['c', 'd', 'd']])
358358
s.columns = ['col1', 'col2']
359359
res = s.apply(lambda x: Series({'min': min(x), 'max': max(x)}), 1)
360-
tm.assertIsInstance(res.index, MultiIndex)
360+
assert isinstance(res.index, MultiIndex)
361361

362362
def test_apply_dict(self):
363363

@@ -385,7 +385,7 @@ def test_applymap(self):
385385

386386
# GH #465, function returning tuples
387387
result = self.frame.applymap(lambda x: (x, x))
388-
tm.assertIsInstance(result['A'][0], tuple)
388+
assert isinstance(result['A'][0], tuple)
389389

390390
# GH 2909, object conversion to float in constructor?
391391
df = DataFrame(data=[1, 'a'])

pandas/tests/frame/test_constructors.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def test_constructor_list_frames(self):
101101
self.assertEqual(result.shape, (1, 0))
102102

103103
result = DataFrame([DataFrame(dict(A=lrange(5)))])
104-
tm.assertIsInstance(result.iloc[0, 0], DataFrame)
104+
assert isinstance(result.iloc[0, 0], DataFrame)
105105

106106
def test_constructor_mixed_dtypes(self):
107107

@@ -397,10 +397,10 @@ def test_constructor_dict_cast(self):
397397
def test_constructor_dict_dont_upcast(self):
398398
d = {'Col1': {'Row1': 'A String', 'Row2': np.nan}}
399399
df = DataFrame(d)
400-
tm.assertIsInstance(df['Col1']['Row2'], float)
400+
assert isinstance(df['Col1']['Row2'], float)
401401

402402
dm = DataFrame([[1, 2], ['a', 'b']], index=[1, 2], columns=[1, 2])
403-
tm.assertIsInstance(dm[1][1], int)
403+
assert isinstance(dm[1][1], int)
404404

405405
def test_constructor_dict_of_tuples(self):
406406
# GH #1491
@@ -1169,7 +1169,7 @@ def test_constructor_from_items(self):
11691169
columns=self.mixed_frame.columns,
11701170
orient='index')
11711171
tm.assert_frame_equal(recons, self.mixed_frame)
1172-
tm.assertIsInstance(recons['foo'][0], tuple)
1172+
assert isinstance(recons['foo'][0], tuple)
11731173

11741174
rs = DataFrame.from_items([('A', [1, 2, 3]), ('B', [4, 5, 6])],
11751175
orient='index',

pandas/tests/frame/test_convert_to.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_to_dict(self):
4545
expected_records = [{'A': 1.0, 'B': '1'},
4646
{'A': 2.0, 'B': '2'},
4747
{'A': np.nan, 'B': '3'}]
48-
tm.assertIsInstance(recons_data, list)
48+
assert isinstance(recons_data, list)
4949
self.assertEqual(len(recons_data), 3)
5050
for l, r in zip(recons_data, expected_records):
5151
tm.assert_dict_equal(l, r)

pandas/tests/frame/test_indexing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,14 +1830,14 @@ def test_iloc_duplicates(self):
18301830
result = df.iloc[0]
18311831
with catch_warnings(record=True):
18321832
result2 = df.ix[0]
1833-
tm.assertIsInstance(result, Series)
1833+
assert isinstance(result, Series)
18341834
assert_almost_equal(result.values, df.values[0])
18351835
assert_series_equal(result, result2)
18361836

18371837
with catch_warnings(record=True):
18381838
result = df.T.iloc[:, 0]
18391839
result2 = df.T.ix[:, 0]
1840-
tm.assertIsInstance(result, Series)
1840+
assert isinstance(result, Series)
18411841
assert_almost_equal(result.values, df.values[0])
18421842
assert_series_equal(result, result2)
18431843

pandas/tests/frame/test_period.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_frame_setitem(self):
4141
self.assertEqual(rng.name, 'index')
4242

4343
rs = df.reset_index().set_index('index')
44-
tm.assertIsInstance(rs.index, PeriodIndex)
44+
assert isinstance(rs.index, PeriodIndex)
4545
tm.assert_index_equal(rs.index, rng)
4646

4747
def test_frame_to_time_stamp(self):

0 commit comments

Comments
 (0)