Skip to content

Commit 71ac2eb

Browse files
jrebackjreback
committed
Merge pull request #10458 from sinhrks/assert_isinstance
TST/CLN: remove assert_isinstance
2 parents 01995b2 + 572510c commit 71ac2eb

37 files changed

+344
-333
lines changed

‎pandas/io/tests/test_excel.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -424,27 +424,27 @@ def test_reader_converters(self):
424424
for path in (xls_path, xlsx_path):
425425
actual = read_excel(path, 'Sheet1', converters=converters)
426426
tm.assert_frame_equal(actual, expected)
427-
427+
428428
def test_reading_all_sheets(self):
429429
# Test reading all sheetnames by setting sheetname to None,
430430
# Ensure a dict is returned.
431431
# See PR #9450
432-
432+
433433
_skip_if_no_xlrd()
434-
434+
435435
dfs = read_excel(self.multisheet,sheetname=None)
436436
expected_keys = ['Alpha','Beta','Charlie']
437437
tm.assert_contains_all(expected_keys,dfs.keys())
438438

439439
def test_reading_multiple_specific_sheets(self):
440-
# Test reading specific sheetnames by specifying a mixed list
440+
# Test reading specific sheetnames by specifying a mixed list
441441
# of integers and strings, and confirm that duplicated sheet
442442
# references (positions/names) are removed properly.
443-
443+
444444
# Ensure a dict is returned
445445
# See PR #9450
446446
_skip_if_no_xlrd()
447-
447+
448448
#Explicitly request duplicates. Only the set should be returned.
449449
expected_keys = [2,'Charlie','Charlie']
450450
dfs = read_excel(self.multisheet,sheetname=expected_keys)
@@ -456,27 +456,27 @@ def test_creating_and_reading_multiple_sheets(self):
456456
# Test reading multiple sheets, from a runtime created excel file
457457
# with multiple sheets.
458458
# See PR #9450
459-
459+
460460
_skip_if_no_xlrd()
461461
_skip_if_no_xlwt()
462-
462+
463463
def tdf(sheetname):
464464
d, i = [11,22,33], [1,2,3]
465465
return DataFrame(d,i,columns=[sheetname])
466-
466+
467467
sheets = ['AAA','BBB','CCC']
468-
468+
469469
dfs = [tdf(s) for s in sheets]
470470
dfs = dict(zip(sheets,dfs))
471-
471+
472472
with ensure_clean('.xlsx') as pth:
473473
with ExcelWriter(pth) as ew:
474474
for sheetname, df in iteritems(dfs):
475475
df.to_excel(ew,sheetname)
476476
dfs_returned = pd.read_excel(pth,sheetname=sheets)
477477
for s in sheets:
478478
tm.assert_frame_equal(dfs[s],dfs_returned[s])
479-
479+
480480
def test_reader_seconds(self):
481481
# Test reading times with and without milliseconds. GH5945.
482482
_skip_if_no_xlrd()
@@ -1575,12 +1575,12 @@ def test_ExcelWriter_dispatch(self):
15751575

15761576
with ensure_clean('.xlsx') as path:
15771577
writer = ExcelWriter(path)
1578-
tm.assert_isinstance(writer, writer_klass)
1578+
tm.assertIsInstance(writer, writer_klass)
15791579

15801580
_skip_if_no_xlwt()
15811581
with ensure_clean('.xls') as path:
15821582
writer = ExcelWriter(path)
1583-
tm.assert_isinstance(writer, _XlwtWriter)
1583+
tm.assertIsInstance(writer, _XlwtWriter)
15841584

15851585
def test_register_writer(self):
15861586
# some awkward mocking to test out dispatch and such actually works
@@ -1608,7 +1608,7 @@ def check_called(func):
16081608

16091609
register_writer(DummyClass)
16101610
writer = ExcelWriter('something.test')
1611-
tm.assert_isinstance(writer, DummyClass)
1611+
tm.assertIsInstance(writer, DummyClass)
16121612
df = tm.makeCustomDataframe(1, 1)
16131613
panel = tm.makePanel()
16141614
func = lambda: df.to_excel('something.test')

‎pandas/io/tests/test_html.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ def test_spam_with_types(self):
159159
def test_spam_no_match(self):
160160
dfs = self.read_html(self.spam_data)
161161
for df in dfs:
162-
tm.assert_isinstance(df, DataFrame)
162+
tm.assertIsInstance(df, DataFrame)
163163

164164
def test_banklist_no_match(self):
165165
dfs = self.read_html(self.banklist_data, attrs={'id': 'table'})
166166
for df in dfs:
167-
tm.assert_isinstance(df, DataFrame)
167+
tm.assertIsInstance(df, DataFrame)
168168

169169
def test_spam_header(self):
170170
df = self.read_html(self.spam_data, '.*Water.*', header=1)[0]
@@ -307,9 +307,9 @@ def test_file_url(self):
307307
url = self.banklist_data
308308
dfs = self.read_html(file_path_to_url(url), 'First',
309309
attrs={'id': 'table'})
310-
tm.assert_isinstance(dfs, list)
310+
tm.assertIsInstance(dfs, list)
311311
for df in dfs:
312-
tm.assert_isinstance(df, DataFrame)
312+
tm.assertIsInstance(df, DataFrame)
313313

314314
@slow
315315
def test_invalid_table_attrs(self):
@@ -325,44 +325,44 @@ def _bank_data(self, *args, **kwargs):
325325
@slow
326326
def test_multiindex_header(self):
327327
df = self._bank_data(header=[0, 1])[0]
328-
tm.assert_isinstance(df.columns, MultiIndex)
328+
tm.assertIsInstance(df.columns, MultiIndex)
329329

330330
@slow
331331
def test_multiindex_index(self):
332332
df = self._bank_data(index_col=[0, 1])[0]
333-
tm.assert_isinstance(df.index, MultiIndex)
333+
tm.assertIsInstance(df.index, MultiIndex)
334334

335335
@slow
336336
def test_multiindex_header_index(self):
337337
df = self._bank_data(header=[0, 1], index_col=[0, 1])[0]
338-
tm.assert_isinstance(df.columns, MultiIndex)
339-
tm.assert_isinstance(df.index, MultiIndex)
338+
tm.assertIsInstance(df.columns, MultiIndex)
339+
tm.assertIsInstance(df.index, MultiIndex)
340340

341341
@slow
342342
def test_multiindex_header_skiprows_tuples(self):
343343
df = self._bank_data(header=[0, 1], skiprows=1, tupleize_cols=True)[0]
344-
tm.assert_isinstance(df.columns, Index)
344+
tm.assertIsInstance(df.columns, Index)
345345

346346
@slow
347347
def test_multiindex_header_skiprows(self):
348348
df = self._bank_data(header=[0, 1], skiprows=1)[0]
349-
tm.assert_isinstance(df.columns, MultiIndex)
349+
tm.assertIsInstance(df.columns, MultiIndex)
350350

351351
@slow
352352
def test_multiindex_header_index_skiprows(self):
353353
df = self._bank_data(header=[0, 1], index_col=[0, 1], skiprows=1)[0]
354-
tm.assert_isinstance(df.index, MultiIndex)
355-
tm.assert_isinstance(df.columns, MultiIndex)
354+
tm.assertIsInstance(df.index, MultiIndex)
355+
tm.assertIsInstance(df.columns, MultiIndex)
356356

357357
@slow
358358
def test_regex_idempotency(self):
359359
url = self.banklist_data
360360
dfs = self.read_html(file_path_to_url(url),
361361
match=re.compile(re.compile('Florida')),
362362
attrs={'id': 'table'})
363-
tm.assert_isinstance(dfs, list)
363+
tm.assertIsInstance(dfs, list)
364364
for df in dfs:
365-
tm.assert_isinstance(df, DataFrame)
365+
tm.assertIsInstance(df, DataFrame)
366366

367367
def test_negative_skiprows(self):
368368
with tm.assertRaisesRegexp(ValueError,
@@ -426,10 +426,10 @@ def test_empty_tables(self):
426426
res1 = self.read_html(StringIO(data1))
427427
res2 = self.read_html(StringIO(data2))
428428
assert_framelist_equal(res1, res2)
429-
429+
430430
def test_tfoot_read(self):
431431
"""
432-
Make sure that read_html reads tfoot, containing td or th.
432+
Make sure that read_html reads tfoot, containing td or th.
433433
Ignores empty tfoot
434434
"""
435435
data_template = '''<table>
@@ -452,10 +452,10 @@ def test_tfoot_read(self):
452452

453453
data1 = data_template.format(footer = "")
454454
data2 = data_template.format(footer ="<tr><td>footA</td><th>footB</th></tr>")
455-
455+
456456
d1 = {'A': ['bodyA'], 'B': ['bodyB']}
457457
d2 = {'A': ['bodyA', 'footA'], 'B': ['bodyB', 'footB']}
458-
458+
459459
tm.assert_frame_equal(self.read_html(data1)[0], DataFrame(d1))
460460
tm.assert_frame_equal(self.read_html(data2)[0], DataFrame(d2))
461461

@@ -721,8 +721,8 @@ def test_data_fail(self):
721721
def test_works_on_valid_markup(self):
722722
filename = os.path.join(DATA_PATH, 'valid_markup.html')
723723
dfs = self.read_html(filename, index_col=0)
724-
tm.assert_isinstance(dfs, list)
725-
tm.assert_isinstance(dfs[0], DataFrame)
724+
tm.assertIsInstance(dfs, list)
725+
tm.assertIsInstance(dfs[0], DataFrame)
726726

727727
@slow
728728
def test_fallback_success(self):

‎pandas/io/tests/test_parsers.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ def test_squeeze(self):
276276
expected = Series([1, 2, 3], name=1, index=idx)
277277
result = self.read_table(StringIO(data), sep=',', index_col=0,
278278
header=None, squeeze=True)
279-
tm.assert_isinstance(result, Series)
279+
tm.assertIsInstance(result, Series)
280280
tm.assert_series_equal(result, expected)
281281

282282
def test_squeeze_no_view(self):
@@ -1016,7 +1016,7 @@ def test_parse_dates_column_list(self):
10161016
expected['aux_date'] = to_datetime(expected['aux_date'],
10171017
dayfirst=True)
10181018
expected['aux_date'] = lmap(Timestamp, expected['aux_date'])
1019-
tm.assert_isinstance(expected['aux_date'][0], datetime)
1019+
tm.assertIsInstance(expected['aux_date'][0], datetime)
10201020

10211021
df = self.read_csv(StringIO(data), sep=";", index_col=lrange(4),
10221022
parse_dates=[0, 5], dayfirst=True)
@@ -1117,7 +1117,7 @@ def test_read_csv_infer_compression(self):
11171117
def test_read_table_unicode(self):
11181118
fin = BytesIO(u('\u0141aski, Jan;1').encode('utf-8'))
11191119
df1 = read_table(fin, sep=";", encoding="utf-8", header=None)
1120-
tm.assert_isinstance(df1[0].values[0], compat.text_type)
1120+
tm.assertIsInstance(df1[0].values[0], compat.text_type)
11211121

11221122
def test_read_table_wrong_num_columns(self):
11231123
# too few!
@@ -1300,7 +1300,7 @@ def test_iterator(self):
13001300

13011301
treader = self.read_table(StringIO(self.data1), sep=',', index_col=0,
13021302
iterator=True)
1303-
tm.assert_isinstance(treader, TextFileReader)
1303+
tm.assertIsInstance(treader, TextFileReader)
13041304

13051305
# stopping iteration when on chunksize is specified, GH 3967
13061306
data = """A,B,C
@@ -1601,7 +1601,7 @@ def test_converters(self):
16011601
expected = self.read_csv(StringIO(data))
16021602
expected['D'] = expected['D'].map(parse_date)
16031603

1604-
tm.assert_isinstance(result['D'][0], (datetime, Timestamp))
1604+
tm.assertIsInstance(result['D'][0], (datetime, Timestamp))
16051605
tm.assert_frame_equal(result, expected)
16061606
tm.assert_frame_equal(result2, expected)
16071607

@@ -2727,7 +2727,7 @@ def test_iterator(self):
27272727

27282728
treader = self.read_table(StringIO(self.data1), sep=',', index_col=0,
27292729
iterator=True)
2730-
tm.assert_isinstance(treader, TextFileReader)
2730+
tm.assertIsInstance(treader, TextFileReader)
27312731

27322732
# stopping iteration when on chunksize is specified, GH 3967
27332733
data = """A,B,C

‎pandas/sparse/tests/test_array.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,19 @@ def _check_op(op, first, second):
129129
res = op(first, second)
130130
exp = SparseArray(op(first.values, second.values),
131131
fill_value=first.fill_value)
132-
tm.assert_isinstance(res, SparseArray)
132+
tm.assertIsInstance(res, SparseArray)
133133
assert_almost_equal(res.values, exp.values)
134134

135135
res2 = op(first, second.values)
136-
tm.assert_isinstance(res2, SparseArray)
136+
tm.assertIsInstance(res2, SparseArray)
137137
assert_sp_array_equal(res, res2)
138138

139139
res3 = op(first.values, second)
140-
tm.assert_isinstance(res3, SparseArray)
140+
tm.assertIsInstance(res3, SparseArray)
141141
assert_sp_array_equal(res, res3)
142142

143143
res4 = op(first, 4)
144-
tm.assert_isinstance(res4, SparseArray)
144+
tm.assertIsInstance(res4, SparseArray)
145145

146146
# ignore this if the actual op raises (e.g. pow)
147147
try:

‎pandas/sparse/tests/test_libsparse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ def _check_case(xloc, xlen, yloc, ylen, eloc, elen):
287287
# see if survive the round trip
288288
xbindex = xindex.to_int_index().to_block_index()
289289
ybindex = yindex.to_int_index().to_block_index()
290-
tm.assert_isinstance(xbindex, BlockIndex)
290+
tm.assertIsInstance(xbindex, BlockIndex)
291291
self.assertTrue(xbindex.equals(xindex))
292292
self.assertTrue(ybindex.equals(yindex))
293293
check_cases(_check_case)

0 commit comments

Comments
 (0)