Skip to content

Commit 5ab2ef9

Browse files
jrebackjreback
committed
Merge pull request #7165 from bwignall/issue7131_assertEquals
CLN: Deprecation of assertEquals
2 parents a161f18 + 6043065 commit 5ab2ef9

32 files changed

+780
-780
lines changed

‎pandas/io/tests/test_cparser.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def test_header_not_enough_lines(self):
190190
as_recarray=True)
191191
header = reader.header
192192
expected = [['a', 'b', 'c']]
193-
self.assertEquals(header, expected)
193+
self.assertEqual(header, expected)
194194

195195
recs = reader.read()
196196
expected = {'a': [1, 4], 'b': [2, 5], 'c': [3, 6]}
@@ -295,7 +295,7 @@ def _make_reader(**kwds):
295295
result = reader.read()
296296

297297
exp = _make_reader().read()
298-
self.assertEquals(len(result), 2)
298+
self.assertEqual(len(result), 2)
299299
self.assertTrue((result[1] == exp[1]).all())
300300
self.assertTrue((result[2] == exp[2]).all())
301301

‎pandas/io/tests/test_data.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def test_google(self):
6262
for locale in self.locales:
6363
with tm.set_locale(locale):
6464
panel = web.DataReader("F", 'google', start, end)
65-
self.assertEquals(panel.Close[-1], 13.68)
65+
self.assertEqual(panel.Close[-1], 13.68)
6666

6767
self.assertRaises(Exception, web.DataReader, "NON EXISTENT TICKER",
6868
'google', start, end)
@@ -88,7 +88,7 @@ def test_get_multi1(self):
8888
ts = pan.Close.GOOG.index[pan.Close.AAPL > pan.Close.GOOG]
8989
if (hasattr(pan, 'Close') and hasattr(pan.Close, 'GOOG') and
9090
hasattr(pan.Close, 'AAPL')):
91-
self.assertEquals(ts[0].dayofyear, 96)
91+
self.assertEqual(ts[0].dayofyear, 96)
9292
else:
9393
self.assertRaises(AttributeError, lambda: pan.Close)
9494

@@ -124,7 +124,7 @@ def test_yahoo(self):
124124
start = datetime(2010, 1, 1)
125125
end = datetime(2013, 1, 27)
126126

127-
self.assertEquals( web.DataReader("F", 'yahoo', start,
127+
self.assertEqual( web.DataReader("F", 'yahoo', start,
128128
end)['Close'][-1], 13.68)
129129

130130
@network
@@ -396,7 +396,7 @@ def test_fred(self):
396396
end = datetime(2013, 1, 27)
397397

398398
received = web.DataReader("GDP", "fred", start, end)['GDP'].tail(1)[0]
399-
self.assertEquals(int(received), 16535)
399+
self.assertEqual(int(received), 16535)
400400

401401
self.assertRaises(Exception, web.DataReader, "NON EXISTENT SERIES",
402402
'fred', start, end)

‎pandas/io/tests/test_excel.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ def test_to_excel_multiindex_dates(self):
823823
has_index_names=self.merge_cells)
824824

825825
tm.assert_frame_equal(tsframe, recons)
826-
self.assertEquals(recons.index.names, ('time', 'foo'))
826+
self.assertEqual(recons.index.names, ('time', 'foo'))
827827

828828
def test_to_excel_multiindex_no_write_index(self):
829829
_skip_if_no_xlrd()
@@ -936,21 +936,21 @@ def test_to_excel_unicode_filename(self):
936936

937937
# wbk = xlrd.open_workbook(filename,
938938
# formatting_info=True)
939-
# self.assertEquals(["test1"], wbk.sheet_names())
939+
# self.assertEqual(["test1"], wbk.sheet_names())
940940
# ws = wbk.sheet_by_name('test1')
941-
# self.assertEquals([(0, 1, 5, 7), (0, 1, 3, 5), (0, 1, 1, 3)],
941+
# self.assertEqual([(0, 1, 5, 7), (0, 1, 3, 5), (0, 1, 1, 3)],
942942
# ws.merged_cells)
943943
# for i in range(0, 2):
944944
# for j in range(0, 7):
945945
# xfx = ws.cell_xf_index(0, 0)
946946
# cell_xf = wbk.xf_list[xfx]
947947
# font = wbk.font_list
948-
# self.assertEquals(1, font[cell_xf.font_index].bold)
949-
# self.assertEquals(1, cell_xf.border.top_line_style)
950-
# self.assertEquals(1, cell_xf.border.right_line_style)
951-
# self.assertEquals(1, cell_xf.border.bottom_line_style)
952-
# self.assertEquals(1, cell_xf.border.left_line_style)
953-
# self.assertEquals(2, cell_xf.alignment.hor_align)
948+
# self.assertEqual(1, font[cell_xf.font_index].bold)
949+
# self.assertEqual(1, cell_xf.border.top_line_style)
950+
# self.assertEqual(1, cell_xf.border.right_line_style)
951+
# self.assertEqual(1, cell_xf.border.bottom_line_style)
952+
# self.assertEqual(1, cell_xf.border.left_line_style)
953+
# self.assertEqual(2, cell_xf.alignment.hor_align)
954954
# os.remove(filename)
955955
# def test_to_excel_header_styling_xlsx(self):
956956
# import StringIO
@@ -982,23 +982,23 @@ def test_to_excel_unicode_filename(self):
982982
# filename = '__tmp_to_excel_header_styling_xlsx__.xlsx'
983983
# pdf.to_excel(filename, 'test1')
984984
# wbk = openpyxl.load_workbook(filename)
985-
# self.assertEquals(["test1"], wbk.get_sheet_names())
985+
# self.assertEqual(["test1"], wbk.get_sheet_names())
986986
# ws = wbk.get_sheet_by_name('test1')
987987
# xlsaddrs = ["%s2" % chr(i) for i in range(ord('A'), ord('H'))]
988988
# xlsaddrs += ["A%s" % i for i in range(1, 6)]
989989
# xlsaddrs += ["B1", "D1", "F1"]
990990
# for xlsaddr in xlsaddrs:
991991
# cell = ws.cell(xlsaddr)
992992
# self.assertTrue(cell.style.font.bold)
993-
# self.assertEquals(openpyxl.style.Border.BORDER_THIN,
993+
# self.assertEqual(openpyxl.style.Border.BORDER_THIN,
994994
# cell.style.borders.top.border_style)
995-
# self.assertEquals(openpyxl.style.Border.BORDER_THIN,
995+
# self.assertEqual(openpyxl.style.Border.BORDER_THIN,
996996
# cell.style.borders.right.border_style)
997-
# self.assertEquals(openpyxl.style.Border.BORDER_THIN,
997+
# self.assertEqual(openpyxl.style.Border.BORDER_THIN,
998998
# cell.style.borders.bottom.border_style)
999-
# self.assertEquals(openpyxl.style.Border.BORDER_THIN,
999+
# self.assertEqual(openpyxl.style.Border.BORDER_THIN,
10001000
# cell.style.borders.left.border_style)
1001-
# self.assertEquals(openpyxl.style.Alignment.HORIZONTAL_CENTER,
1001+
# self.assertEqual(openpyxl.style.Alignment.HORIZONTAL_CENTER,
10021002
# cell.style.alignment.horizontal)
10031003
# mergedcells_addrs = ["C1", "E1", "G1"]
10041004
# for maddr in mergedcells_addrs:
@@ -1109,17 +1109,17 @@ def test_to_excel_styleconverter(self):
11091109

11101110
xlsx_style = _OpenpyxlWriter._convert_to_style(hstyle)
11111111
self.assertTrue(xlsx_style.font.bold)
1112-
self.assertEquals(openpyxl.style.Border.BORDER_THIN,
1112+
self.assertEqual(openpyxl.style.Border.BORDER_THIN,
11131113
xlsx_style.borders.top.border_style)
1114-
self.assertEquals(openpyxl.style.Border.BORDER_THIN,
1114+
self.assertEqual(openpyxl.style.Border.BORDER_THIN,
11151115
xlsx_style.borders.right.border_style)
1116-
self.assertEquals(openpyxl.style.Border.BORDER_THIN,
1116+
self.assertEqual(openpyxl.style.Border.BORDER_THIN,
11171117
xlsx_style.borders.bottom.border_style)
1118-
self.assertEquals(openpyxl.style.Border.BORDER_THIN,
1118+
self.assertEqual(openpyxl.style.Border.BORDER_THIN,
11191119
xlsx_style.borders.left.border_style)
1120-
self.assertEquals(openpyxl.style.Alignment.HORIZONTAL_CENTER,
1120+
self.assertEqual(openpyxl.style.Alignment.HORIZONTAL_CENTER,
11211121
xlsx_style.alignment.horizontal)
1122-
self.assertEquals(openpyxl.style.Alignment.VERTICAL_TOP,
1122+
self.assertEqual(openpyxl.style.Alignment.VERTICAL_TOP,
11231123
xlsx_style.alignment.vertical)
11241124

11251125

@@ -1142,12 +1142,12 @@ def test_to_excel_styleconverter(self):
11421142

11431143
xls_style = _XlwtWriter._convert_to_style(hstyle)
11441144
self.assertTrue(xls_style.font.bold)
1145-
self.assertEquals(xlwt.Borders.THIN, xls_style.borders.top)
1146-
self.assertEquals(xlwt.Borders.THIN, xls_style.borders.right)
1147-
self.assertEquals(xlwt.Borders.THIN, xls_style.borders.bottom)
1148-
self.assertEquals(xlwt.Borders.THIN, xls_style.borders.left)
1149-
self.assertEquals(xlwt.Alignment.HORZ_CENTER, xls_style.alignment.horz)
1150-
self.assertEquals(xlwt.Alignment.VERT_TOP, xls_style.alignment.vert)
1145+
self.assertEqual(xlwt.Borders.THIN, xls_style.borders.top)
1146+
self.assertEqual(xlwt.Borders.THIN, xls_style.borders.right)
1147+
self.assertEqual(xlwt.Borders.THIN, xls_style.borders.bottom)
1148+
self.assertEqual(xlwt.Borders.THIN, xls_style.borders.left)
1149+
self.assertEqual(xlwt.Alignment.HORZ_CENTER, xls_style.alignment.horz)
1150+
self.assertEqual(xlwt.Alignment.VERT_TOP, xls_style.alignment.vert)
11511151

11521152

11531153
class XlsxWriterTests(ExcelWriterBase, tm.TestCase):

0 commit comments

Comments
 (0)