Skip to content

Commit 034c994

Browse files
jrebackjreback
committed
Merge pull request #7172 from bwignall/issue7131_assert_
CLN: Deprecation of assert_
2 parents 6617d57 + 88a8a17 commit 034c994

File tree

8 files changed

+37
-37
lines changed

8 files changed

+37
-37
lines changed

‎pandas/io/tests/test_packers.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ def test_dict_float(self):
149149
def test_dict_complex(self):
150150
x = {'foo': 1.0 + 1.0j, 'bar': 2.0 + 2.0j}
151151
x_rec = self.encode_decode(x)
152-
self.assert_(all(map(lambda x, y: x == y, x.values(), x_rec.values())) and
153-
all(map(lambda x, y: type(x) == type(y), x.values(), x_rec.values())))
152+
self.assertTrue(all(map(lambda x, y: x == y, x.values(), x_rec.values())) and
153+
all(map(lambda x, y: type(x) == type(y), x.values(), x_rec.values())))
154154

155155
def test_dict_numpy_float(self):
156156
x = {'foo': np.float32(1.0), 'bar': np.float32(2.0)}
@@ -161,8 +161,8 @@ def test_dict_numpy_complex(self):
161161
x = {'foo': np.complex128(
162162
1.0 + 1.0j), 'bar': np.complex128(2.0 + 2.0j)}
163163
x_rec = self.encode_decode(x)
164-
self.assert_(all(map(lambda x, y: x == y, x.values(), x_rec.values())) and
165-
all(map(lambda x, y: type(x) == type(y), x.values(), x_rec.values())))
164+
self.assertTrue(all(map(lambda x, y: x == y, x.values(), x_rec.values())) and
165+
all(map(lambda x, y: type(x) == type(y), x.values(), x_rec.values())))
166166

167167

168168
def test_numpy_array_float(self):
@@ -178,8 +178,8 @@ def test_numpy_array_float(self):
178178
def test_numpy_array_complex(self):
179179
x = (np.random.rand(5) + 1j * np.random.rand(5)).astype(np.complex128)
180180
x_rec = self.encode_decode(x)
181-
self.assert_(all(map(lambda x, y: x == y, x, x_rec)) and
182-
x.dtype == x_rec.dtype)
181+
self.assertTrue(all(map(lambda x, y: x == y, x, x_rec)) and
182+
x.dtype == x_rec.dtype)
183183

184184
def test_list_mixed(self):
185185
x = [1.0, np.float32(3.5), np.complex128(4.25), u('foo')]

‎pandas/io/tests/test_pytables.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ def test_keys(self):
339339
store['d'] = tm.makePanel()
340340
store['foo/bar'] = tm.makePanel()
341341
self.assertEqual(len(store), 5)
342-
self.assert_(set(
343-
store.keys()) == set(['/a', '/b', '/c', '/d', '/foo/bar']))
342+
self.assertTrue(set(
343+
store.keys()) == set(['/a', '/b', '/c', '/d', '/foo/bar']))
344344

345345
def test_repr(self):
346346

@@ -1077,8 +1077,8 @@ def test_ndim_indexables(self):
10771077

10781078
def check_indexers(key, indexers):
10791079
for i, idx in enumerate(indexers):
1080-
self.assert_(getattr(getattr(
1081-
store.root, key).table.description, idx)._v_pos == i)
1080+
self.assertTrue(getattr(getattr(
1081+
store.root, key).table.description, idx)._v_pos == i)
10821082

10831083
# append then change (will take existing schema)
10841084
indexers = ['items', 'major_axis', 'minor_axis']

‎pandas/tests/test_format.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,8 +1382,8 @@ def test_to_string(self):
13821382
header=None, sep=' ')
13831383
tm.assert_series_equal(recons['B'], biggie['B'])
13841384
self.assertEqual(recons['A'].count(), biggie['A'].count())
1385-
self.assert_((np.abs(recons['A'].dropna() -
1386-
biggie['A'].dropna()) < 0.1).all())
1385+
self.assertTrue((np.abs(recons['A'].dropna() -
1386+
biggie['A'].dropna()) < 0.1).all())
13871387

13881388
# expected = ['B', 'A']
13891389
# self.assertEqual(header, expected)

‎pandas/tests/test_frame.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,8 +1601,8 @@ def test_get_set_value_no_partial_indexing(self):
16011601

16021602
def test_single_element_ix_dont_upcast(self):
16031603
self.frame['E'] = 1
1604-
self.assert_(issubclass(self.frame['E'].dtype.type,
1605-
(int, np.integer)))
1604+
self.assertTrue(issubclass(self.frame['E'].dtype.type,
1605+
(int, np.integer)))
16061606

16071607
result = self.frame.ix[self.frame.index[5], 'E']
16081608
self.assertTrue(com.is_integer(result))

‎pandas/tests/test_panel.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,8 +1085,8 @@ def test_apply(self):
10851085

10861086
# ufunc
10871087
applied = self.panel.apply(np.sqrt)
1088-
self.assert_(assert_almost_equal(applied.values,
1089-
np.sqrt(self.panel.values)))
1088+
self.assertTrue(assert_almost_equal(applied.values,
1089+
np.sqrt(self.panel.values)))
10901090

10911091
# ufunc same shape
10921092
result = self.panel.apply(lambda x: x*2, axis='items')

‎pandas/tseries/tests/test_frequencies.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -217,31 +217,31 @@ def _check_generated_range(self, start, freq):
217217
self.assertEqual(infer_freq(index), gen.freqstr)
218218
else:
219219
inf_freq = infer_freq(index)
220-
self.assert_((inf_freq == 'Q-DEC' and
221-
gen.freqstr in ('Q', 'Q-DEC', 'Q-SEP', 'Q-JUN',
222-
'Q-MAR'))
223-
or
224-
(inf_freq == 'Q-NOV' and
225-
gen.freqstr in ('Q-NOV', 'Q-AUG', 'Q-MAY', 'Q-FEB'))
226-
or
227-
(inf_freq == 'Q-OCT' and
228-
gen.freqstr in ('Q-OCT', 'Q-JUL', 'Q-APR', 'Q-JAN')))
220+
self.assertTrue((inf_freq == 'Q-DEC' and
221+
gen.freqstr in ('Q', 'Q-DEC', 'Q-SEP', 'Q-JUN',
222+
'Q-MAR'))
223+
or
224+
(inf_freq == 'Q-NOV' and
225+
gen.freqstr in ('Q-NOV', 'Q-AUG', 'Q-MAY', 'Q-FEB'))
226+
or
227+
(inf_freq == 'Q-OCT' and
228+
gen.freqstr in ('Q-OCT', 'Q-JUL', 'Q-APR', 'Q-JAN')))
229229

230230
gen = date_range(start, periods=5, freq=freq)
231231
index = _dti(gen.values)
232232
if not freq.startswith('Q-'):
233233
self.assertEqual(infer_freq(index), gen.freqstr)
234234
else:
235235
inf_freq = infer_freq(index)
236-
self.assert_((inf_freq == 'Q-DEC' and
237-
gen.freqstr in ('Q', 'Q-DEC', 'Q-SEP', 'Q-JUN',
238-
'Q-MAR'))
239-
or
240-
(inf_freq == 'Q-NOV' and
241-
gen.freqstr in ('Q-NOV', 'Q-AUG', 'Q-MAY', 'Q-FEB'))
242-
or
243-
(inf_freq == 'Q-OCT' and
244-
gen.freqstr in ('Q-OCT', 'Q-JUL', 'Q-APR', 'Q-JAN')))
236+
self.assertTrue((inf_freq == 'Q-DEC' and
237+
gen.freqstr in ('Q', 'Q-DEC', 'Q-SEP', 'Q-JUN',
238+
'Q-MAR'))
239+
or
240+
(inf_freq == 'Q-NOV' and
241+
gen.freqstr in ('Q-NOV', 'Q-AUG', 'Q-MAY', 'Q-FEB'))
242+
or
243+
(inf_freq == 'Q-OCT' and
244+
gen.freqstr in ('Q-OCT', 'Q-JUL', 'Q-APR', 'Q-JAN')))
245245

246246
def test_infer_freq(self):
247247
rng = period_range('1959Q2', '2009Q3', freq='Q')

‎pandas/tseries/tests/test_timezones.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ def test_append_aware_naive(self):
840840
ts1 = Series(np.random.randn(len(rng1)), index=rng1)
841841
ts2 = Series(np.random.randn(len(rng2)), index=rng2)
842842
ts_result = ts1.append(ts2)
843-
self.assert_(ts_result.index.equals(
843+
self.assertTrue(ts_result.index.equals(
844844
ts1.index.asobject.append(ts2.index.asobject)))
845845

846846
# mixed
@@ -850,7 +850,7 @@ def test_append_aware_naive(self):
850850
ts1 = Series(np.random.randn(len(rng1)), index=rng1)
851851
ts2 = Series(np.random.randn(len(rng2)), index=rng2)
852852
ts_result = ts1.append(ts2)
853-
self.assert_(ts_result.index.equals(
853+
self.assertTrue(ts_result.index.equals(
854854
ts1.index.asobject.append(ts2.index)))
855855

856856
def test_equal_join_ensure_utc(self):

‎pandas/tseries/tests/test_tslib.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def test_coercing_dates_outside_of_datetime64_ns_bounds(self):
177177
coerce=False,
178178
raise_=True,
179179
)
180-
self.assert_(
180+
self.assertTrue(
181181
np.array_equal(
182182
tslib.array_to_datetime(
183183
np.array([invalid_date], dtype='object'), coerce=True

0 commit comments

Comments
 (0)