Skip to content

Commit f8b25c2

Browse files
gfyoungjorisvandenbossche
gfyoung
authored and
jorisvandenbossche
committed
MAINT: Remove self.assertRaisesRegexp from testing (pandas-dev#16113)
* MAINT: Remove self.assertRaisesRegexp from testing * MAINT: Do not add static assert methods to TestCase
1 parent 844013b commit f8b25c2

30 files changed

+111
-117
lines changed

‎pandas/tests/groupby/test_groupby.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -1874,16 +1874,16 @@ def test_groupby_args(self):
18741874
def j():
18751875
frame.groupby()
18761876

1877-
self.assertRaisesRegexp(TypeError,
1878-
"You have to supply one of 'by' and 'level'",
1879-
j)
1877+
tm.assertRaisesRegexp(TypeError,
1878+
"You have to supply one of 'by' and 'level'",
1879+
j)
18801880

18811881
def k():
18821882
frame.groupby(by=None, level=None)
18831883

1884-
self.assertRaisesRegexp(TypeError,
1885-
"You have to supply one of 'by' and 'level'",
1886-
k)
1884+
tm.assertRaisesRegexp(TypeError,
1885+
"You have to supply one of 'by' and 'level'",
1886+
k)
18871887

18881888
def test_groupby_level_mapper(self):
18891889
frame = self.mframe

‎pandas/tests/groupby/test_transform.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ def test_transform_with_non_scalar_group(self):
556556
df = pd.DataFrame(np.random.randint(1, 10, (4, 12)),
557557
columns=cols,
558558
index=['A', 'C', 'G', 'T'])
559-
self.assertRaisesRegexp(ValueError, 'transform must return a scalar '
560-
'value for each group.*', df.groupby
561-
(axis=1, level=1).transform,
562-
lambda z: z.div(z.sum(axis=1), axis=0))
559+
tm.assertRaisesRegexp(ValueError, 'transform must return a scalar '
560+
'value for each group.*', df.groupby
561+
(axis=1, level=1).transform,
562+
lambda z: z.div(z.sum(axis=1), axis=0))

‎pandas/tests/indexes/common.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ def test_fillna(self):
875875
elif isinstance(index, MultiIndex):
876876
idx = index.copy()
877877
msg = "isnull is not defined for MultiIndex"
878-
with self.assertRaisesRegexp(NotImplementedError, msg):
878+
with tm.assertRaisesRegexp(NotImplementedError, msg):
879879
idx.fillna(idx[0])
880880
else:
881881
idx = index.copy()
@@ -884,7 +884,7 @@ def test_fillna(self):
884884
self.assertFalse(result is idx)
885885

886886
msg = "'value' must be a scalar, passed: "
887-
with self.assertRaisesRegexp(TypeError, msg):
887+
with tm.assertRaisesRegexp(TypeError, msg):
888888
idx.fillna([idx[0]])
889889

890890
idx = index.copy()
@@ -918,7 +918,7 @@ def test_nulls(self):
918918
elif isinstance(index, MultiIndex):
919919
idx = index.copy()
920920
msg = "isnull is not defined for MultiIndex"
921-
with self.assertRaisesRegexp(NotImplementedError, msg):
921+
with tm.assertRaisesRegexp(NotImplementedError, msg):
922922
idx.isnull()
923923
else:
924924

‎pandas/tests/indexes/datetimes/test_date_range.py

+16-16
Original file line numberDiff line numberDiff line change
@@ -212,31 +212,31 @@ def test_naive_aware_conflicts(self):
212212
naive = bdate_range(START, END, freq=BDay(), tz=None)
213213
aware = bdate_range(START, END, freq=BDay(),
214214
tz="Asia/Hong_Kong")
215-
self.assertRaisesRegexp(TypeError, "tz-naive.*tz-aware",
216-
naive.join, aware)
217-
self.assertRaisesRegexp(TypeError, "tz-naive.*tz-aware",
218-
aware.join, naive)
215+
tm.assertRaisesRegexp(TypeError, "tz-naive.*tz-aware",
216+
naive.join, aware)
217+
tm.assertRaisesRegexp(TypeError, "tz-naive.*tz-aware",
218+
aware.join, naive)
219219

220220
def test_cached_range(self):
221221
DatetimeIndex._cached_range(START, END, offset=BDay())
222222
DatetimeIndex._cached_range(START, periods=20, offset=BDay())
223223
DatetimeIndex._cached_range(end=START, periods=20, offset=BDay())
224224

225-
self.assertRaisesRegexp(TypeError, "offset",
226-
DatetimeIndex._cached_range,
227-
START, END)
225+
tm.assertRaisesRegexp(TypeError, "offset",
226+
DatetimeIndex._cached_range,
227+
START, END)
228228

229-
self.assertRaisesRegexp(TypeError, "specify period",
230-
DatetimeIndex._cached_range, START,
231-
offset=BDay())
229+
tm.assertRaisesRegexp(TypeError, "specify period",
230+
DatetimeIndex._cached_range, START,
231+
offset=BDay())
232232

233-
self.assertRaisesRegexp(TypeError, "specify period",
234-
DatetimeIndex._cached_range, end=END,
235-
offset=BDay())
233+
tm.assertRaisesRegexp(TypeError, "specify period",
234+
DatetimeIndex._cached_range, end=END,
235+
offset=BDay())
236236

237-
self.assertRaisesRegexp(TypeError, "start or end",
238-
DatetimeIndex._cached_range, periods=20,
239-
offset=BDay())
237+
tm.assertRaisesRegexp(TypeError, "start or end",
238+
DatetimeIndex._cached_range, periods=20,
239+
offset=BDay())
240240

241241
def test_cached_range_bug(self):
242242
rng = date_range('2010-09-01 05:00:00', periods=50,

‎pandas/tests/indexes/datetimes/test_datetime.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -755,12 +755,12 @@ def assert_slices_equivalent(l_slc, i_slc):
755755
def test_slice_with_zero_step_raises(self):
756756
ts = Series(np.arange(20),
757757
date_range('2014-01-01', periods=20, freq='MS'))
758-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
759-
lambda: ts[::0])
760-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
761-
lambda: ts.loc[::0])
762-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
763-
lambda: ts.loc[::0])
758+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
759+
lambda: ts[::0])
760+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
761+
lambda: ts.loc[::0])
762+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
763+
lambda: ts.loc[::0])
764764

765765
def test_slice_bounds_empty(self):
766766
# GH 14354

‎pandas/tests/indexes/datetimes/test_partial_slicing.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ def test_partial_slice_second_precision(self):
122122
tm.assert_series_equal(s['2005-1-1 00:01:00'], s.iloc[10:])
123123

124124
self.assertEqual(s[Timestamp('2005-1-1 00:00:59.999990')], s.iloc[0])
125-
self.assertRaisesRegexp(KeyError, '2005-1-1 00:00:00',
126-
lambda: s['2005-1-1 00:00:00'])
125+
tm.assertRaisesRegexp(KeyError, '2005-1-1 00:00:00',
126+
lambda: s['2005-1-1 00:00:00'])
127127

128128
def test_partial_slicing_dataframe(self):
129129
# GH14856
@@ -249,14 +249,14 @@ def test_partial_slice_doesnt_require_monotonicity(self):
249249
timestamp = pd.Timestamp('2014-01-10')
250250

251251
tm.assert_series_equal(nonmonotonic['2014-01-10':], expected)
252-
self.assertRaisesRegexp(KeyError,
253-
r"Timestamp\('2014-01-10 00:00:00'\)",
254-
lambda: nonmonotonic[timestamp:])
252+
tm.assertRaisesRegexp(KeyError,
253+
r"Timestamp\('2014-01-10 00:00:00'\)",
254+
lambda: nonmonotonic[timestamp:])
255255

256256
tm.assert_series_equal(nonmonotonic.loc['2014-01-10':], expected)
257-
self.assertRaisesRegexp(KeyError,
258-
r"Timestamp\('2014-01-10 00:00:00'\)",
259-
lambda: nonmonotonic.loc[timestamp:])
257+
tm.assertRaisesRegexp(KeyError,
258+
r"Timestamp\('2014-01-10 00:00:00'\)",
259+
lambda: nonmonotonic.loc[timestamp:])
260260

261261
def test_loc_datetime_length_one(self):
262262
# GH16071

‎pandas/tests/indexes/period/test_indexing.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ def test_getitem_partial(self):
103103
tm.assert_series_equal(exp, result)
104104

105105
ts = ts[10:].append(ts[10:])
106-
self.assertRaisesRegexp(KeyError,
107-
"left slice bound for non-unique "
108-
"label: '2008'",
109-
ts.__getitem__, slice('2008', '2009'))
106+
tm.assertRaisesRegexp(KeyError,
107+
"left slice bound for non-unique "
108+
"label: '2008'",
109+
ts.__getitem__, slice('2008', '2009'))
110110

111111
def test_getitem_datetime(self):
112112
rng = period_range(start='2012-01-01', periods=10, freq='W-MON')

‎pandas/tests/indexes/period/test_partial_slicing.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ def assert_slices_equivalent(l_slc, i_slc):
4242
def test_slice_with_zero_step_raises(self):
4343
ts = Series(np.arange(20),
4444
period_range('2014-01', periods=20, freq='M'))
45-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
46-
lambda: ts[::0])
47-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
48-
lambda: ts.loc[::0])
49-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
50-
lambda: ts.loc[::0])
45+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
46+
lambda: ts[::0])
47+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
48+
lambda: ts.loc[::0])
49+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
50+
lambda: ts.loc[::0])
5151

5252
def test_slice_keep_name(self):
5353
idx = period_range('20010101', periods=10, freq='D', name='bob')

‎pandas/tests/indexes/period/test_period.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def test_get_indexer(self):
151151
np.array([0, -1, 1], dtype=np.intp))
152152

153153
msg = 'Input has different freq from PeriodIndex\\(freq=H\\)'
154-
with self.assertRaisesRegexp(ValueError, msg):
154+
with tm.assertRaisesRegexp(ValueError, msg):
155155
idx.get_indexer(target, 'nearest', tolerance='1 minute')
156156

157157
tm.assert_numpy_array_equal(idx.get_indexer(target, 'nearest',

‎pandas/tests/indexes/period/test_tools.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ def test_to_period_monthish(self):
386386
self.assertEqual(prng.freq, 'M')
387387

388388
msg = pd.tseries.frequencies._INVALID_FREQ_ERROR
389-
with self.assertRaisesRegexp(ValueError, msg):
389+
with tm.assertRaisesRegexp(ValueError, msg):
390390
date_range('01-Jan-2012', periods=8, freq='EOM')
391391

392392
def test_period_dt64_round_trip(self):
@@ -439,11 +439,11 @@ def test_searchsorted(self):
439439
self.assertEqual(pidx.searchsorted(p2), 3)
440440

441441
msg = "Input has different freq=H from PeriodIndex"
442-
with self.assertRaisesRegexp(period.IncompatibleFrequency, msg):
442+
with tm.assertRaisesRegexp(period.IncompatibleFrequency, msg):
443443
pidx.searchsorted(pd.Period('2014-01-01', freq='H'))
444444

445445
msg = "Input has different freq=5D from PeriodIndex"
446-
with self.assertRaisesRegexp(period.IncompatibleFrequency, msg):
446+
with tm.assertRaisesRegexp(period.IncompatibleFrequency, msg):
447447
pidx.searchsorted(pd.Period('2014-01-01', freq='5D'))
448448

449449
with tm.assert_produces_warning(FutureWarning):

‎pandas/tests/indexes/test_base.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1450,8 +1450,8 @@ def test_str_attribute(self):
14501450
MultiIndex.from_tuples([('foo', '1'), ('bar', '3')]),
14511451
PeriodIndex(start='2000', end='2010', freq='A')]
14521452
for idx in indices:
1453-
with self.assertRaisesRegexp(AttributeError,
1454-
'only use .str accessor'):
1453+
with tm.assertRaisesRegexp(AttributeError,
1454+
'only use .str accessor'):
14551455
idx.str.repeat(2)
14561456

14571457
idx = Index(['a b c', 'd e', 'f'])

‎pandas/tests/indexes/test_interval.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,9 @@ def test_comparison(self):
602602
actual = self.index == self.index.left
603603
tm.assert_numpy_array_equal(actual, np.array([False, False]))
604604

605-
with self.assertRaisesRegexp(TypeError, 'unorderable types'):
605+
with tm.assertRaisesRegexp(TypeError, 'unorderable types'):
606606
self.index > 0
607-
with self.assertRaisesRegexp(TypeError, 'unorderable types'):
607+
with tm.assertRaisesRegexp(TypeError, 'unorderable types'):
608608
self.index <= 0
609609
with pytest.raises(TypeError):
610610
self.index > np.arange(2)

‎pandas/tests/indexes/timedeltas/test_ops.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def test_round(self):
115115
self.assertEqual(elt.round(freq='H'), expected_elt)
116116

117117
msg = pd.tseries.frequencies._INVALID_FREQ_ERROR
118-
with self.assertRaisesRegexp(ValueError, msg):
118+
with tm.assertRaisesRegexp(ValueError, msg):
119119
td.round(freq='foo')
120120
with tm.assertRaisesRegexp(ValueError, msg):
121121
elt.round(freq='foo')

‎pandas/tests/indexes/timedeltas/test_partial_slicing.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ def assert_slices_equivalent(l_slc, i_slc):
7575

7676
def test_slice_with_zero_step_raises(self):
7777
ts = Series(np.arange(20), timedelta_range('0', periods=20, freq='H'))
78-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
79-
lambda: ts[::0])
80-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
81-
lambda: ts.loc[::0])
82-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
83-
lambda: ts.loc[::0])
78+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
79+
lambda: ts[::0])
80+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
81+
lambda: ts.loc[::0])
82+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
83+
lambda: ts.loc[::0])

‎pandas/tests/indexing/test_floats.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ def test_scalar_error(self):
4848

4949
def f():
5050
s.iloc[3.0]
51-
self.assertRaisesRegexp(TypeError,
52-
'cannot do positional indexing',
53-
f)
51+
tm.assertRaisesRegexp(TypeError,
52+
'cannot do positional indexing',
53+
f)
5454

5555
def f():
5656
s.iloc[3.0] = 0

‎pandas/tests/indexing/test_indexing.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -716,13 +716,13 @@ def assert_slices_equivalent(l_slc, i_slc):
716716

717717
def test_slice_with_zero_step_raises(self):
718718
s = Series(np.arange(20), index=_mklbl('A', 20))
719-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
720-
lambda: s[::0])
721-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
722-
lambda: s.loc[::0])
719+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
720+
lambda: s[::0])
721+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
722+
lambda: s.loc[::0])
723723
with catch_warnings(record=True):
724-
self.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
725-
lambda: s.ix[::0])
724+
tm.assertRaisesRegexp(ValueError, 'slice step cannot be zero',
725+
lambda: s.ix[::0])
726726

727727
def test_indexing_assignment_dict_already_exists(self):
728728
df = pd.DataFrame({'x': [1, 2, 6],

‎pandas/tests/indexing/test_scalar.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ def test_at_to_fail(self):
154154
df.columns = ['x', 'x', 'z']
155155

156156
# Check that we get the correct value in the KeyError
157-
self.assertRaisesRegexp(KeyError, r"\['y'\] not in index",
158-
lambda: df[['x', 'y', 'z']])
157+
tm.assertRaisesRegexp(KeyError, r"\['y'\] not in index",
158+
lambda: df[['x', 'y', 'z']])
159159

160160
def test_at_with_tz(self):
161161
# gh-15822

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ def test_to_jsonl(self):
10361036

10371037
def test_latin_encoding(self):
10381038
if compat.PY2:
1039-
self.assertRaisesRegexp(
1039+
tm.assertRaisesRegexp(
10401040
TypeError, r'\[unicode\] is not implemented as a table column')
10411041
return
10421042

‎pandas/tests/io/parser/compression.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ def test_zip(self):
4545
tmp.writestr(file_name, data)
4646
tmp.close()
4747

48-
self.assertRaisesRegexp(ValueError, 'Multiple files',
49-
self.read_csv, path, compression='zip')
48+
tm.assertRaisesRegexp(ValueError, 'Multiple files',
49+
self.read_csv, path, compression='zip')
5050

51-
self.assertRaisesRegexp(ValueError, 'Multiple files',
52-
self.read_csv, path, compression='infer')
51+
tm.assertRaisesRegexp(ValueError, 'Multiple files',
52+
self.read_csv, path, compression='infer')
5353

5454
with tm.ensure_clean() as path:
5555
tmp = zipfile.ZipFile(path, mode='w')
5656
tmp.close()
5757

58-
self.assertRaisesRegexp(ValueError, 'Zero files',
59-
self.read_csv, path, compression='zip')
58+
tm.assertRaisesRegexp(ValueError, 'Zero files',
59+
self.read_csv, path, compression='zip')
6060

6161
with tm.ensure_clean() as path:
6262
with open(path, 'wb') as f:

‎pandas/tests/io/test_pytables.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ def test_encoding(self):
971971
def test_latin_encoding(self):
972972

973973
if compat.PY2:
974-
self.assertRaisesRegexp(
974+
tm.assertRaisesRegexp(
975975
TypeError, r'\[unicode\] is not implemented as a table column')
976976
return
977977

‎pandas/tests/scalar/test_interval.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test_equal(self):
4646
self.assertNotEqual(Interval(0, 1), 0)
4747

4848
def test_comparison(self):
49-
with self.assertRaisesRegexp(TypeError, 'unorderable types'):
49+
with tm.assertRaisesRegexp(TypeError, 'unorderable types'):
5050
Interval(0, 1) < 2
5151

5252
self.assertTrue(Interval(0, 1) < Interval(1, 2))

‎pandas/tests/scalar/test_period.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -518,9 +518,9 @@ def test_period_deprecated_freq(self):
518518
msg = pd.tseries.frequencies._INVALID_FREQ_ERROR
519519
for exp, freqs in iteritems(cases):
520520
for freq in freqs:
521-
with self.assertRaisesRegexp(ValueError, msg):
521+
with tm.assertRaisesRegexp(ValueError, msg):
522522
Period('2016-03-01 09:00', freq=freq)
523-
with self.assertRaisesRegexp(ValueError, msg):
523+
with tm.assertRaisesRegexp(ValueError, msg):
524524
Period(ordinal=1, freq=freq)
525525

526526
# check supported freq-aliases still works
@@ -762,7 +762,7 @@ def test_properties_weekly_legacy(self):
762762
self.assertEqual(exp.days_in_month, 29)
763763

764764
msg = pd.tseries.frequencies._INVALID_FREQ_ERROR
765-
with self.assertRaisesRegexp(ValueError, msg):
765+
with tm.assertRaisesRegexp(ValueError, msg):
766766
Period(freq='WK', year=2007, month=1, day=7)
767767

768768
def test_properties_daily(self):

0 commit comments

Comments
 (0)