Skip to content

Commit acd2422

Browse files
jrebackjreback
committed
Merge pull request #9465 from sinhrks/assertequals
TST: Remove assertEquals
2 parents 0c95fef + 077688e commit acd2422

15 files changed

+146
-108
lines changed

‎pandas/tests/test_categorical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,7 +1457,7 @@ def test_describe(self):
14571457

14581458
# Categoricals should not show up together with numerical columns
14591459
result = self.cat.describe()
1460-
self.assertEquals(len(result.columns),1)
1460+
self.assertEqual(len(result.columns),1)
14611461

14621462

14631463
# In a frame, describe() for the cat should be the same as for string arrays (count, unique,

‎pandas/tests/test_common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,7 @@ def test_maybe_convert_string_to_array(self):
955955
self.assertTrue(result.dtype == object)
956956

957957
result = com._maybe_convert_string_to_object(1)
958-
self.assertEquals(result, 1)
958+
self.assertEqual(result, 1)
959959

960960
arr = np.array(['x', 'y'], dtype=str)
961961
result = com._maybe_convert_string_to_object(arr)

‎pandas/tests/test_frame.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10414,7 +10414,7 @@ def test_applymap(self):
1041410414
df['timedelta'] = Timedelta('1 min')
1041510415
result = df.applymap(str)
1041610416
for f in ['datetime','timedelta']:
10417-
self.assertEquals(result.loc[0,f],str(df.loc[0,f]))
10417+
self.assertEqual(result.loc[0,f],str(df.loc[0,f]))
1041810418

1041910419
def test_filter(self):
1042010420
# items

‎pandas/tests/test_indexing.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -899,22 +899,22 @@ def f():
899899
# GH 7814
900900
s = Series([1,2,3], index=list('abc'))
901901
result = s.at['a']
902-
self.assertEquals(result, 1)
902+
self.assertEqual(result, 1)
903903
self.assertRaises(ValueError, lambda : s.at[0])
904904

905905
df = DataFrame({'A' : [1,2,3]},index=list('abc'))
906906
result = df.at['a','A']
907-
self.assertEquals(result, 1)
907+
self.assertEqual(result, 1)
908908
self.assertRaises(ValueError, lambda : df.at['a',0])
909909

910910
s = Series([1,2,3], index=[3,2,1])
911911
result = s.at[1]
912-
self.assertEquals(result, 3)
912+
self.assertEqual(result, 3)
913913
self.assertRaises(ValueError, lambda : s.at['a'])
914914

915915
df = DataFrame({0 : [1,2,3]},index=[3,2,1])
916916
result = df.at[1,0]
917-
self.assertEquals(result, 3)
917+
self.assertEqual(result, 3)
918918
self.assertRaises(ValueError, lambda : df.at['a',0])
919919

920920
def test_loc_getitem_label_slice(self):

‎pandas/tests/test_multilevel.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,26 +92,26 @@ def test_append_index(self):
9292
(1.2, datetime.datetime(2011, 1, 2, tzinfo=tz)),
9393
(1.3, datetime.datetime(2011, 1, 3, tzinfo=tz))]
9494
expected = Index([1.1, 1.2, 1.3] + expected_tuples)
95-
self.assert_(result.equals(expected))
95+
self.assertTrue(result.equals(expected))
9696

9797
result = midx_lv2.append(idx1)
9898
expected = Index(expected_tuples + [1.1, 1.2, 1.3])
99-
self.assert_(result.equals(expected))
99+
self.assertTrue(result.equals(expected))
100100

101101
result = midx_lv2.append(midx_lv2)
102102
expected = MultiIndex.from_arrays([idx1.append(idx1), idx2.append(idx2)])
103-
self.assert_(result.equals(expected))
103+
self.assertTrue(result.equals(expected))
104104

105105
result = midx_lv2.append(midx_lv3)
106-
self.assert_(result.equals(expected))
106+
self.assertTrue(result.equals(expected))
107107

108108
result = midx_lv3.append(midx_lv2)
109109
expected = Index._simple_new(
110110
np.array([(1.1, datetime.datetime(2011, 1, 1, tzinfo=tz), 'A'),
111111
(1.2, datetime.datetime(2011, 1, 2, tzinfo=tz), 'B'),
112112
(1.3, datetime.datetime(2011, 1, 3, tzinfo=tz), 'C')]
113113
+ expected_tuples), None)
114-
self.assert_(result.equals(expected))
114+
self.assertTrue(result.equals(expected))
115115

116116
def test_dataframe_constructor(self):
117117
multi = DataFrame(np.random.randn(4, 4),

‎pandas/tests/test_series.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,14 +303,14 @@ def test_get(self):
303303
df = pd.DataFrame({'i':[0]*3, 'b':[False]*3})
304304
vc = df.i.value_counts()
305305
result = vc.get(99,default='Missing')
306-
self.assertEquals(result,'Missing')
306+
self.assertEqual(result,'Missing')
307307

308308
vc = df.b.value_counts()
309309
result = vc.get(False,default='Missing')
310-
self.assertEquals(result,3)
310+
self.assertEqual(result,3)
311311

312312
result = vc.get(True,default='Missing')
313-
self.assertEquals(result,'Missing')
313+
self.assertEqual(result,'Missing')
314314

315315
def test_delitem(self):
316316

@@ -2240,7 +2240,7 @@ def test_sem(self):
22402240
# 1 - element series with ddof=1
22412241
s = self.ts.iloc[[0]]
22422242
result = s.sem(ddof=1)
2243-
self.assert_(isnull(result))
2243+
self.assertTrue(isnull(result))
22442244

22452245
def test_skew(self):
22462246
tm._skip_if_no_scipy()
@@ -2606,7 +2606,7 @@ def test_all_any(self):
26062606

26072607
# Alternative types, with implicit 'object' dtype.
26082608
s = Series(['abc', True])
2609-
self.assertEquals('abc', s.any()) # 'abc' || True => 'abc'
2609+
self.assertEqual('abc', s.any()) # 'abc' || True => 'abc'
26102610

26112611
def test_all_any_params(self):
26122612
# Check skipna, with implicit 'object' dtype.

‎pandas/tests/test_strings.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -653,13 +653,13 @@ def test_ismethods(self):
653653
tm.assert_series_equal(str_s.str.isupper(), Series(upper_e))
654654
tm.assert_series_equal(str_s.str.istitle(), Series(title_e))
655655

656-
self.assertEquals(str_s.str.isalnum().tolist(), [v.isalnum() for v in values])
657-
self.assertEquals(str_s.str.isalpha().tolist(), [v.isalpha() for v in values])
658-
self.assertEquals(str_s.str.isdigit().tolist(), [v.isdigit() for v in values])
659-
self.assertEquals(str_s.str.isspace().tolist(), [v.isspace() for v in values])
660-
self.assertEquals(str_s.str.islower().tolist(), [v.islower() for v in values])
661-
self.assertEquals(str_s.str.isupper().tolist(), [v.isupper() for v in values])
662-
self.assertEquals(str_s.str.istitle().tolist(), [v.istitle() for v in values])
656+
self.assertEqual(str_s.str.isalnum().tolist(), [v.isalnum() for v in values])
657+
self.assertEqual(str_s.str.isalpha().tolist(), [v.isalpha() for v in values])
658+
self.assertEqual(str_s.str.isdigit().tolist(), [v.isdigit() for v in values])
659+
self.assertEqual(str_s.str.isspace().tolist(), [v.isspace() for v in values])
660+
self.assertEqual(str_s.str.islower().tolist(), [v.islower() for v in values])
661+
self.assertEqual(str_s.str.isupper().tolist(), [v.isupper() for v in values])
662+
self.assertEqual(str_s.str.istitle().tolist(), [v.istitle() for v in values])
663663

664664
def test_isnumeric(self):
665665
# 0x00bc: ¼ VULGAR FRACTION ONE QUARTER
@@ -675,8 +675,8 @@ def test_isnumeric(self):
675675
tm.assert_series_equal(s.str.isdecimal(), Series(decimal_e))
676676
unicodes = [u('A'), u('3'), unichr(0x00bc), unichr(0x2605),
677677
unichr(0x1378), unichr(0xFF13), u('four')]
678-
self.assertEquals(s.str.isnumeric().tolist(), [v.isnumeric() for v in unicodes])
679-
self.assertEquals(s.str.isdecimal().tolist(), [v.isdecimal() for v in unicodes])
678+
self.assertEqual(s.str.isnumeric().tolist(), [v.isnumeric() for v in unicodes])
679+
self.assertEqual(s.str.isdecimal().tolist(), [v.isdecimal() for v in unicodes])
680680

681681
values = ['A', np.nan, unichr(0x00bc), unichr(0x2605),
682682
np.nan, unichr(0xFF13), 'four']

‎pandas/tests/test_util.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,26 @@ def f4(new=None):
6060
pass
6161

6262

63+
class TestTesting(tm.TestCase):
64+
65+
def test_warning(self):
66+
67+
with tm.assert_produces_warning(FutureWarning):
68+
self.assertEquals(1, 1)
69+
70+
with tm.assert_produces_warning(FutureWarning):
71+
self.assertNotEquals(1, 2)
72+
73+
with tm.assert_produces_warning(FutureWarning):
74+
self.assert_(True)
75+
76+
with tm.assert_produces_warning(FutureWarning):
77+
self.assertAlmostEquals(1.0, 1.0000000001)
78+
79+
with tm.assert_produces_warning(FutureWarning):
80+
self.assertNotAlmostEquals(1, 2)
81+
82+
6383
def test_rands():
6484
r = tm.rands(10)
6585
assert(len(r) == 10)

‎pandas/tseries/tests/test_base.py

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

4040
# attribute access should still work!
4141
s = Series(dict(year=2000,month=1,day=10))
42-
self.assertEquals(s.year,2000)
43-
self.assertEquals(s.month,1)
44-
self.assertEquals(s.day,10)
42+
self.assertEqual(s.year,2000)
43+
self.assertEqual(s.month,1)
44+
self.assertEqual(s.day,10)
4545
self.assertRaises(AttributeError, lambda : s.weekday)
4646

4747
def test_asobject_tolist(self):

‎pandas/tseries/tests/test_daterange.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -408,19 +408,19 @@ def test_range_tz_dateutil(self):
408408
end = datetime(2011, 1, 3, tzinfo=tz('US/Eastern'))
409409

410410
dr = date_range(start=start, periods=3)
411-
self.assert_(dr.tz == tz('US/Eastern'))
412-
self.assert_(dr[0] == start)
413-
self.assert_(dr[2] == end)
411+
self.assertTrue(dr.tz == tz('US/Eastern'))
412+
self.assertTrue(dr[0] == start)
413+
self.assertTrue(dr[2] == end)
414414

415415
dr = date_range(end=end, periods=3)
416-
self.assert_(dr.tz == tz('US/Eastern'))
417-
self.assert_(dr[0] == start)
418-
self.assert_(dr[2] == end)
416+
self.assertTrue(dr.tz == tz('US/Eastern'))
417+
self.assertTrue(dr[0] == start)
418+
self.assertTrue(dr[2] == end)
419419

420420
dr = date_range(start=start, end=end)
421-
self.assert_(dr.tz == tz('US/Eastern'))
422-
self.assert_(dr[0] == start)
423-
self.assert_(dr[2] == end)
421+
self.assertTrue(dr.tz == tz('US/Eastern'))
422+
self.assertTrue(dr[0] == start)
423+
self.assertTrue(dr[2] == end)
424424

425425
def test_month_range_union_tz_pytz(self):
426426
tm._skip_if_no_pytz()

‎pandas/tseries/tests/test_offsets.py

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ def test_add(self):
391391
for tz in self.timezones:
392392
expected_localize = expected.tz_localize(tz)
393393
result = Timestamp(dt, tz=tz) + offset_s
394-
self.assert_(isinstance(result, Timestamp))
394+
self.assertTrue(isinstance(result, Timestamp))
395395
self.assertEqual(result, expected_localize)
396396

397397
# normalize=True
@@ -407,7 +407,7 @@ def test_add(self):
407407
for tz in self.timezones:
408408
expected_localize = expected.tz_localize(tz)
409409
result = Timestamp(dt, tz=tz) + offset_s
410-
self.assert_(isinstance(result, Timestamp))
410+
self.assertTrue(isinstance(result, Timestamp))
411411
self.assertEqual(result, expected_localize)
412412

413413

@@ -2842,20 +2842,20 @@ def test_Hour(self):
28422842
assertEq(2 * Hour(), datetime(2010, 1, 1), datetime(2010, 1, 1, 2))
28432843
assertEq(-1 * Hour(), datetime(2010, 1, 1, 1), datetime(2010, 1, 1))
28442844

2845-
self.assertEquals(Hour(3) + Hour(2), Hour(5))
2846-
self.assertEquals(Hour(3) - Hour(2), Hour())
2845+
self.assertEqual(Hour(3) + Hour(2), Hour(5))
2846+
self.assertEqual(Hour(3) - Hour(2), Hour())
28472847

2848-
self.assertNotEquals(Hour(4), Hour(1))
2848+
self.assertNotEqual(Hour(4), Hour(1))
28492849

28502850
def test_Minute(self):
28512851
assertEq(Minute(), datetime(2010, 1, 1), datetime(2010, 1, 1, 0, 1))
28522852
assertEq(Minute(-1), datetime(2010, 1, 1, 0, 1), datetime(2010, 1, 1))
28532853
assertEq(2 * Minute(), datetime(2010, 1, 1), datetime(2010, 1, 1, 0, 2))
28542854
assertEq(-1 * Minute(), datetime(2010, 1, 1, 0, 1), datetime(2010, 1, 1))
28552855

2856-
self.assertEquals(Minute(3) + Minute(2), Minute(5))
2857-
self.assertEquals(Minute(3) - Minute(2), Minute())
2858-
self.assertNotEquals(Minute(5), Minute())
2856+
self.assertEqual(Minute(3) + Minute(2), Minute(5))
2857+
self.assertEqual(Minute(3) - Minute(2), Minute())
2858+
self.assertNotEqual(Minute(5), Minute())
28592859

28602860
def test_Second(self):
28612861
assertEq(Second(), datetime(2010, 1, 1), datetime(2010, 1, 1, 0, 0, 1))
@@ -2864,8 +2864,8 @@ def test_Second(self):
28642864
assertEq(
28652865
-1 * Second(), datetime(2010, 1, 1, 0, 0, 1), datetime(2010, 1, 1))
28662866

2867-
self.assertEquals(Second(3) + Second(2), Second(5))
2868-
self.assertEquals(Second(3) - Second(2), Second())
2867+
self.assertEqual(Second(3) + Second(2), Second(5))
2868+
self.assertEqual(Second(3) - Second(2), Second())
28692869

28702870
def test_Millisecond(self):
28712871
assertEq(Milli(), datetime(2010, 1, 1), datetime(2010, 1, 1, 0, 0, 0, 1000))
@@ -2874,8 +2874,8 @@ def test_Millisecond(self):
28742874
assertEq(2 * Milli(), datetime(2010, 1, 1), datetime(2010, 1, 1, 0, 0, 0, 2000))
28752875
assertEq(-1 * Milli(), datetime(2010, 1, 1, 0, 0, 0, 1000), datetime(2010, 1, 1))
28762876

2877-
self.assertEquals(Milli(3) + Milli(2), Milli(5))
2878-
self.assertEquals(Milli(3) - Milli(2), Milli())
2877+
self.assertEqual(Milli(3) + Milli(2), Milli(5))
2878+
self.assertEqual(Milli(3) - Milli(2), Milli())
28792879

28802880
def test_MillisecondTimestampArithmetic(self):
28812881
assertEq(Milli(), Timestamp('2010-01-01'), Timestamp('2010-01-01 00:00:00.001'))
@@ -2887,18 +2887,18 @@ def test_Microsecond(self):
28872887
assertEq(2 * Micro(), datetime(2010, 1, 1), datetime(2010, 1, 1, 0, 0, 0, 2))
28882888
assertEq(-1 * Micro(), datetime(2010, 1, 1, 0, 0, 0, 1), datetime(2010, 1, 1))
28892889

2890-
self.assertEquals(Micro(3) + Micro(2), Micro(5))
2891-
self.assertEquals(Micro(3) - Micro(2), Micro())
2890+
self.assertEqual(Micro(3) + Micro(2), Micro(5))
2891+
self.assertEqual(Micro(3) - Micro(2), Micro())
28922892

28932893
def test_NanosecondGeneric(self):
28942894
timestamp = Timestamp(datetime(2010, 1, 1))
2895-
self.assertEquals(timestamp.nanosecond, 0)
2895+
self.assertEqual(timestamp.nanosecond, 0)
28962896

28972897
result = timestamp + Nano(10)
2898-
self.assertEquals(result.nanosecond, 10)
2898+
self.assertEqual(result.nanosecond, 10)
28992899

29002900
reverse_result = Nano(10) + timestamp
2901-
self.assertEquals(reverse_result.nanosecond, 10)
2901+
self.assertEqual(reverse_result.nanosecond, 10)
29022902

29032903
def test_Nanosecond(self):
29042904
timestamp = Timestamp(datetime(2010, 1, 1))
@@ -2907,40 +2907,40 @@ def test_Nanosecond(self):
29072907
assertEq(2 * Nano(), timestamp, timestamp + np.timedelta64(2, 'ns'))
29082908
assertEq(-1 * Nano(), timestamp + np.timedelta64(1, 'ns'), timestamp)
29092909

2910-
self.assertEquals(Nano(3) + Nano(2), Nano(5))
2911-
self.assertEquals(Nano(3) - Nano(2), Nano())
2910+
self.assertEqual(Nano(3) + Nano(2), Nano(5))
2911+
self.assertEqual(Nano(3) - Nano(2), Nano())
29122912

29132913
# GH9284
2914-
self.assertEquals(Nano(1) + Nano(10), Nano(11))
2915-
self.assertEquals(Nano(5) + Micro(1), Nano(1005))
2916-
self.assertEquals(Micro(5) + Nano(1), Nano(5001))
2914+
self.assertEqual(Nano(1) + Nano(10), Nano(11))
2915+
self.assertEqual(Nano(5) + Micro(1), Nano(1005))
2916+
self.assertEqual(Micro(5) + Nano(1), Nano(5001))
29172917

29182918
def test_tick_zero(self):
29192919
for t1 in self.ticks:
29202920
for t2 in self.ticks:
2921-
self.assertEquals(t1(0), t2(0))
2922-
self.assertEquals(t1(0) + t2(0), t1(0))
2921+
self.assertEqual(t1(0), t2(0))
2922+
self.assertEqual(t1(0) + t2(0), t1(0))
29232923

29242924
if t1 is not Nano:
2925-
self.assertEquals(t1(2) + t2(0), t1(2))
2925+
self.assertEqual(t1(2) + t2(0), t1(2))
29262926
if t1 is Nano:
2927-
self.assertEquals(t1(2) + Nano(0), t1(2))
2927+
self.assertEqual(t1(2) + Nano(0), t1(2))
29282928

29292929
def test_tick_equalities(self):
29302930
for t in self.ticks:
2931-
self.assertEquals(t(3), t(3))
2932-
self.assertEquals(t(), t(1))
2931+
self.assertEqual(t(3), t(3))
2932+
self.assertEqual(t(), t(1))
29332933

29342934
# not equals
2935-
self.assertNotEquals(t(3), t(2))
2936-
self.assertNotEquals(t(3), t(-3))
2935+
self.assertNotEqual(t(3), t(2))
2936+
self.assertNotEqual(t(3), t(-3))
29372937

29382938
def test_tick_operators(self):
29392939
for t in self.ticks:
2940-
self.assertEquals(t(3) + t(2), t(5))
2941-
self.assertEquals(t(3) - t(2), t(1))
2942-
self.assertEquals(t(800) + t(300), t(1100))
2943-
self.assertEquals(t(1000) - t(5), t(995))
2940+
self.assertEqual(t(3) + t(2), t(5))
2941+
self.assertEqual(t(3) - t(2), t(1))
2942+
self.assertEqual(t(800) + t(300), t(1100))
2943+
self.assertEqual(t(1000) - t(5), t(995))
29442944

29452945
def test_tick_offset(self):
29462946
for t in self.ticks:

‎pandas/tseries/tests/test_timedeltas.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,11 @@ def test_freq_conversion(self):
226226

227227
td = Timedelta('1 days 2 hours 3 ns')
228228
result = td / np.timedelta64(1,'D')
229-
self.assertEquals(result, td.value/float(86400*1e9))
229+
self.assertEqual(result, td.value/float(86400*1e9))
230230
result = td / np.timedelta64(1,'s')
231-
self.assertEquals(result, td.value/float(1e9))
231+
self.assertEqual(result, td.value/float(1e9))
232232
result = td / np.timedelta64(1,'ns')
233-
self.assertEquals(result, td.value)
233+
self.assertEqual(result, td.value)
234234

235235
def test_ops_ndarray(self):
236236
td = Timedelta('1 day')

0 commit comments

Comments
 (0)