Skip to content

Commit cd6b4cf

Browse files
jrebackjreback
committed
Merge pull request #7164 from bwignall/issue7131_assert2
CLN: Deprecation of assert_
2 parents a0b9a6a + 4590996 commit cd6b4cf

Some content is hidden

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

45 files changed

+859
-859
lines changed

‎pandas/io/tests/test_cparser.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,21 +236,21 @@ def _make_reader(**kwds):
236236
self.assertEqual(result[0].dtype, 'S5')
237237

238238
ex_values = np.array(['a', 'aa', 'aaa', 'aaaa', 'aaaaa'], dtype='S5')
239-
self.assert_((result[0] == ex_values).all())
239+
self.assertTrue((result[0] == ex_values).all())
240240
self.assertEqual(result[1].dtype, 'i4')
241241

242242
reader = _make_reader(dtype='S4')
243243
result = reader.read()
244244
self.assertEqual(result[0].dtype, 'S4')
245245
ex_values = np.array(['a', 'aa', 'aaa', 'aaaa', 'aaaa'], dtype='S4')
246-
self.assert_((result[0] == ex_values).all())
246+
self.assertTrue((result[0] == ex_values).all())
247247
self.assertEqual(result[1].dtype, 'S4')
248248

249249
reader = _make_reader(dtype='S4', as_recarray=True)
250250
result = reader.read()
251251
self.assertEqual(result['0'].dtype, 'S4')
252252
ex_values = np.array(['a', 'aa', 'aaa', 'aaaa', 'aaaa'], dtype='S4')
253-
self.assert_((result['0'] == ex_values).all())
253+
self.assertTrue((result['0'] == ex_values).all())
254254
self.assertEqual(result['1'].dtype, 'S4')
255255

256256
def test_pass_dtype(self):

‎pandas/io/tests/test_data.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def test_get_data_multiple_symbols_two_dates(self):
217217
def test_get_date_ret_index(self):
218218
pan = web.get_data_yahoo(['GE', 'INTC', 'IBM'], '1977', '1987',
219219
ret_index=True)
220-
self.assert_(hasattr(pan, 'Ret_Index'))
220+
self.assertTrue(hasattr(pan, 'Ret_Index'))
221221
if hasattr(pan, 'Ret_Index') and hasattr(pan.Ret_Index, 'INTC'):
222222
tstamp = pan.Ret_Index.INTC.first_valid_index()
223223
result = pan.Ret_Index.ix[tstamp]['INTC']
@@ -358,7 +358,7 @@ def test_get_put_data_warning(self):
358358
class TestDataReader(tm.TestCase):
359359
def test_is_s3_url(self):
360360
from pandas.io.common import _is_s3_url
361-
self.assert_(_is_s3_url("s3://pandas/somethingelse.com"))
361+
self.assertTrue(_is_s3_url("s3://pandas/somethingelse.com"))
362362

363363
@network
364364
def test_read_yahoo(self):

‎pandas/io/tests/test_date_converters.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def setUp(self):
3939

4040
def test_parse_date_time(self):
4141
result = conv.parse_date_time(self.dates, self.times)
42-
self.assert_((result == self.expected).all())
42+
self.assertTrue((result == self.expected).all())
4343

4444
data = """\
4545
date, time, a, b
@@ -66,7 +66,7 @@ def test_parse_date_time(self):
6666
def test_parse_date_fields(self):
6767
result = conv.parse_date_fields(self.years, self.months, self.days)
6868
expected = np.array([datetime(2007, 1, 3), datetime(2008, 2, 4)])
69-
self.assert_((result == expected).all())
69+
self.assertTrue((result == expected).all())
7070

7171
data = "year, month, day, a\n 2001 , 01 , 10 , 10.\n 2001 , 02 , 1 , 11."
7272
datecols = {'ymd': [0, 1, 2]}
@@ -79,7 +79,7 @@ def test_parse_date_fields(self):
7979
def test_datetime_six_col(self):
8080
result = conv.parse_all_fields(self.years, self.months, self.days,
8181
self.hours, self.minutes, self.seconds)
82-
self.assert_((result == self.expected).all())
82+
self.assertTrue((result == self.expected).all())
8383

8484
data = """\
8585
year, month, day, hour, minute, second, a, b

‎pandas/io/tests/test_excel.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,8 +1223,8 @@ def write_cells(self, *args, **kwargs):
12231223

12241224
def check_called(func):
12251225
func()
1226-
self.assert_(len(called_save) >= 1)
1227-
self.assert_(len(called_write_cells) >= 1)
1226+
self.assertTrue(len(called_save) >= 1)
1227+
self.assertTrue(len(called_write_cells) >= 1)
12281228
del called_save[:]
12291229
del called_write_cells[:]
12301230

‎pandas/io/tests/test_ga.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def test_remove_token_store(self):
2727
fh.write('test')
2828

2929
reset_default_token_store()
30-
self.assert_(not os.path.exists(auth.DEFAULT_TOKEN_FILE))
30+
self.assertFalse(os.path.exists(auth.DEFAULT_TOKEN_FILE))
3131

3232
@slow
3333
@network

‎pandas/io/tests/test_html.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ def test_multiple_matches(self):
383383
url = 'http://code.google.com/p/pythonxy/wiki/StandardPlugins'
384384
dfs = self.read_html(url, match='Python',
385385
attrs={'class': 'wikitable'})
386-
self.assert_(len(dfs) > 1)
386+
self.assertTrue(len(dfs) > 1)
387387

388388
@network
389389
def test_pythonxy_plugins_table(self):

‎pandas/io/tests/test_json/test_pandas.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def _check_orient(df, orient, dtype=None, numpy=False,
152152
if orient == "records":
153153
# index is not captured in this orientation
154154
assert_almost_equal(df.values, unser.values)
155-
self.assert_(df.columns.equals(unser.columns))
155+
self.assertTrue(df.columns.equals(unser.columns))
156156
elif orient == "values":
157157
# index and cols are not captured in this orientation
158158
assert_almost_equal(df.values, unser.values)

‎pandas/io/tests/test_json/test_ujson.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def test_encodeDoubleTinyExponential(self):
120120
num = -1e-45
121121
self.assertEqual(num, ujson.decode(ujson.encode(num)))
122122
num = -1e-145
123-
self.assert_(np.allclose(num, ujson.decode(ujson.encode(num))))
123+
self.assertTrue(np.allclose(num, ujson.decode(ujson.encode(num))))
124124

125125
def test_encodeDictWithUnicodeKeys(self):
126126
input = {u("key1"): u("value1"), u("key1"):
@@ -1315,39 +1315,39 @@ def testIndex(self):
13151315

13161316
# column indexed
13171317
outp = Index(ujson.decode(ujson.encode(i)))
1318-
self.assert_(i.equals(outp))
1318+
self.assertTrue(i.equals(outp))
13191319

13201320
outp = Index(ujson.decode(ujson.encode(i), numpy=True))
1321-
self.assert_(i.equals(outp))
1321+
self.assertTrue(i.equals(outp))
13221322

13231323
dec = _clean_dict(ujson.decode(ujson.encode(i, orient="split")))
13241324
outp = Index(**dec)
1325-
self.assert_(i.equals(outp))
1325+
self.assertTrue(i.equals(outp))
13261326
self.assertTrue(i.name == outp.name)
13271327

13281328
dec = _clean_dict(ujson.decode(ujson.encode(i, orient="split"),
13291329
numpy=True))
13301330
outp = Index(**dec)
1331-
self.assert_(i.equals(outp))
1331+
self.assertTrue(i.equals(outp))
13321332
self.assertTrue(i.name == outp.name)
13331333

13341334
outp = Index(ujson.decode(ujson.encode(i, orient="values")))
1335-
self.assert_(i.equals(outp))
1335+
self.assertTrue(i.equals(outp))
13361336

13371337
outp = Index(ujson.decode(ujson.encode(i, orient="values"), numpy=True))
1338-
self.assert_(i.equals(outp))
1338+
self.assertTrue(i.equals(outp))
13391339

13401340
outp = Index(ujson.decode(ujson.encode(i, orient="records")))
1341-
self.assert_(i.equals(outp))
1341+
self.assertTrue(i.equals(outp))
13421342

13431343
outp = Index(ujson.decode(ujson.encode(i, orient="records"), numpy=True))
1344-
self.assert_(i.equals(outp))
1344+
self.assertTrue(i.equals(outp))
13451345

13461346
outp = Index(ujson.decode(ujson.encode(i, orient="index")))
1347-
self.assert_(i.equals(outp))
1347+
self.assertTrue(i.equals(outp))
13481348

13491349
outp = Index(ujson.decode(ujson.encode(i, orient="index"), numpy=True))
1350-
self.assert_(i.equals(outp))
1350+
self.assertTrue(i.equals(outp))
13511351

13521352
def test_datetimeindex(self):
13531353
from pandas.tseries.index import date_range
@@ -1357,7 +1357,7 @@ def test_datetimeindex(self):
13571357
encoded = ujson.encode(rng, date_unit='ns')
13581358
decoded = DatetimeIndex(np.array(ujson.decode(encoded)))
13591359

1360-
self.assert_(rng.equals(decoded))
1360+
self.assertTrue(rng.equals(decoded))
13611361

13621362
ts = Series(np.random.randn(len(rng)), index=rng)
13631363
decoded = Series(ujson.decode(ujson.encode(ts, date_unit='ns')))

‎pandas/io/tests/test_packers.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def test_numpy_scalar_float(self):
103103
def test_numpy_scalar_complex(self):
104104
x = np.complex64(np.random.rand() + 1j * np.random.rand())
105105
x_rec = self.encode_decode(x)
106-
self.assert_(np.allclose(x, x_rec))
106+
self.assertTrue(np.allclose(x, x_rec))
107107

108108
def test_scalar_float(self):
109109
x = np.random.rand()
@@ -113,7 +113,7 @@ def test_scalar_float(self):
113113
def test_scalar_complex(self):
114114
x = np.random.rand() + 1j * np.random.rand()
115115
x_rec = self.encode_decode(x)
116-
self.assert_(np.allclose(x, x_rec))
116+
self.assertTrue(np.allclose(x, x_rec))
117117

118118
def test_list_numpy_float(self):
119119
x = [np.float32(np.random.rand()) for i in range(5)]
@@ -128,7 +128,7 @@ def test_list_numpy_float_complex(self):
128128
[np.complex128(np.random.rand() + 1j * np.random.rand())
129129
for i in range(5)]
130130
x_rec = self.encode_decode(x)
131-
self.assert_(np.allclose(x, x_rec))
131+
self.assertTrue(np.allclose(x, x_rec))
132132

133133
def test_list_float(self):
134134
x = [np.random.rand() for i in range(5)]
@@ -139,7 +139,7 @@ def test_list_float_complex(self):
139139
x = [np.random.rand() for i in range(5)] + \
140140
[(np.random.rand() + 1j * np.random.rand()) for i in range(5)]
141141
x_rec = self.encode_decode(x)
142-
self.assert_(np.allclose(x, x_rec))
142+
self.assertTrue(np.allclose(x, x_rec))
143143

144144
def test_dict_float(self):
145145
x = {'foo': 1.0, 'bar': 2.0}
@@ -244,23 +244,23 @@ def test_basic_index(self):
244244

245245
for s, i in self.d.items():
246246
i_rec = self.encode_decode(i)
247-
self.assert_(i.equals(i_rec))
247+
self.assertTrue(i.equals(i_rec))
248248

249249
# datetime with no freq (GH5506)
250250
i = Index([Timestamp('20130101'),Timestamp('20130103')])
251251
i_rec = self.encode_decode(i)
252-
self.assert_(i.equals(i_rec))
252+
self.assertTrue(i.equals(i_rec))
253253

254254
# datetime with timezone
255255
i = Index([Timestamp('20130101 9:00:00'),Timestamp('20130103 11:00:00')]).tz_localize('US/Eastern')
256256
i_rec = self.encode_decode(i)
257-
self.assert_(i.equals(i_rec))
257+
self.assertTrue(i.equals(i_rec))
258258

259259
def test_multi_index(self):
260260

261261
for s, i in self.mi.items():
262262
i_rec = self.encode_decode(i)
263-
self.assert_(i.equals(i_rec))
263+
self.assertTrue(i.equals(i_rec))
264264

265265
def test_unicode(self):
266266
i = tm.makeUnicodeIndex(100)
@@ -269,7 +269,7 @@ def test_unicode(self):
269269
self.assertRaises(UnicodeEncodeError, self.encode_decode, i)
270270

271271
#i_rec = self.encode_decode(i)
272-
#self.assert_(i.equals(i_rec))
272+
#self.assertTrue(i.equals(i_rec))
273273

274274

275275
class TestSeries(TestPackers):

‎pandas/io/tests/test_parsers.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ def test_malformed(self):
528528
try:
529529
df = self.read_table(
530530
StringIO(data), sep=',', header=1, comment='#')
531-
self.assert_(False)
531+
self.assertTrue(False)
532532
except Exception as inst:
533533
self.assertIn('Expected 3 fields in line 4, saw 5', str(inst))
534534

@@ -551,7 +551,7 @@ def test_malformed(self):
551551
df = self.read_table(
552552
StringIO(data), sep=',', header=1, comment='#',
553553
skip_footer=1)
554-
self.assert_(False)
554+
self.assertTrue(False)
555555
except Exception as inst:
556556
self.assertIn('Expected 3 fields in line 4, saw 5', str(inst))
557557

@@ -569,7 +569,7 @@ def test_malformed(self):
569569
header=1, comment='#', iterator=True, chunksize=1,
570570
skiprows=[2])
571571
df = it.read(5)
572-
self.assert_(False)
572+
self.assertTrue(False)
573573
except Exception as inst:
574574
self.assertIn('Expected 3 fields in line 6, saw 5', str(inst))
575575

@@ -588,7 +588,7 @@ def test_malformed(self):
588588
skiprows=[2])
589589
df = it.read(1)
590590
it.read(2)
591-
self.assert_(False)
591+
self.assertTrue(False)
592592
except Exception as inst:
593593
self.assertIn('Expected 3 fields in line 6, saw 5', str(inst))
594594

@@ -607,7 +607,7 @@ def test_malformed(self):
607607
skiprows=[2])
608608
df = it.read(1)
609609
it.read()
610-
self.assert_(False)
610+
self.assertTrue(False)
611611
except Exception as inst:
612612
self.assertIn('Expected 3 fields in line 6, saw 5', str(inst))
613613

@@ -1134,7 +1134,7 @@ def test_infer_index_col(self):
11341134
baz,7,8,9
11351135
"""
11361136
data = self.read_csv(StringIO(data))
1137-
self.assert_(data.index.equals(Index(['foo', 'bar', 'baz'])))
1137+
self.assertTrue(data.index.equals(Index(['foo', 'bar', 'baz'])))
11381138

11391139
def test_read_nrows(self):
11401140
df = self.read_csv(StringIO(self.data1), nrows=3)
@@ -1912,7 +1912,7 @@ def convert_score(x):
19121912
result = self.read_csv(fh, converters={'score': convert_score,
19131913
'days': convert_days},
19141914
na_values=['', None])
1915-
self.assert_(pd.isnull(result['days'][1]))
1915+
self.assertTrue(pd.isnull(result['days'][1]))
19161916

19171917
fh = StringIO(csv)
19181918
result2 = self.read_csv(fh, converters={'score': convert_score,
@@ -2177,7 +2177,7 @@ def test_sniff_delimiter(self):
21772177
baz|7|8|9
21782178
"""
21792179
data = self.read_csv(StringIO(text), index_col=0, sep=None)
2180-
self.assert_(data.index.equals(Index(['foo', 'bar', 'baz'])))
2180+
self.assertTrue(data.index.equals(Index(['foo', 'bar', 'baz'])))
21812181

21822182
data2 = self.read_csv(StringIO(text), index_col=0, delimiter='|')
21832183
tm.assert_frame_equal(data, data2)
@@ -2378,7 +2378,7 @@ def test_fwf_regression(self):
23782378

23792379
for c in df.columns:
23802380
res = df.loc[:,c]
2381-
self.assert_(len(res))
2381+
self.assertTrue(len(res))
23822382

23832383
def test_fwf_compression(self):
23842384
try:
@@ -2577,7 +2577,7 @@ def test_malformed(self):
25772577
try:
25782578
df = self.read_table(
25792579
StringIO(data), sep=',', header=1, comment='#')
2580-
self.assert_(False)
2580+
self.assertTrue(False)
25812581
except Exception as inst:
25822582
self.assertIn('Expected 3 fields in line 4, saw 5', str(inst))
25832583

@@ -2594,7 +2594,7 @@ def test_malformed(self):
25942594
df = self.read_table(
25952595
StringIO(data), sep=',', header=1, comment='#',
25962596
skip_footer=1)
2597-
self.assert_(False)
2597+
self.assertTrue(False)
25982598
except Exception as inst:
25992599
self.assertIn('Expected 3 fields in line 4, saw 5', str(inst))
26002600

@@ -2612,7 +2612,7 @@ def test_malformed(self):
26122612
header=1, comment='#', iterator=True, chunksize=1,
26132613
skiprows=[2])
26142614
df = it.read(5)
2615-
self.assert_(False)
2615+
self.assertTrue(False)
26162616
except Exception as inst:
26172617
self.assertIn('Expected 3 fields in line 6, saw 5', str(inst))
26182618

@@ -2631,7 +2631,7 @@ def test_malformed(self):
26312631
skiprows=[2])
26322632
df = it.read(1)
26332633
it.read(2)
2634-
self.assert_(False)
2634+
self.assertTrue(False)
26352635
except Exception as inst:
26362636
self.assertIn('Expected 3 fields in line 6, saw 5', str(inst))
26372637

@@ -2650,7 +2650,7 @@ def test_malformed(self):
26502650
skiprows=[2])
26512651
df = it.read(1)
26522652
it.read()
2653-
self.assert_(False)
2653+
self.assertTrue(False)
26542654
except Exception as inst:
26552655
self.assertIn('Expected 3 fields in line 6, saw 5', str(inst))
26562656

0 commit comments

Comments
 (0)