Skip to content

CLN: Deprecation of assertEquals #7165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 18, 2014
Merged

CLN: Deprecation of assertEquals #7165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pandas/io/tests/test_cparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ def test_header_not_enough_lines(self):
as_recarray=True)
header = reader.header
expected = [['a', 'b', 'c']]
self.assertEquals(header, expected)
self.assertEqual(header, expected)

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

exp = _make_reader().read()
self.assertEquals(len(result), 2)
self.assertEqual(len(result), 2)
self.assertTrue((result[1] == exp[1]).all())
self.assertTrue((result[2] == exp[2]).all())

Expand Down
8 changes: 4 additions & 4 deletions pandas/io/tests/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def test_google(self):
for locale in self.locales:
with tm.set_locale(locale):
panel = web.DataReader("F", 'google', start, end)
self.assertEquals(panel.Close[-1], 13.68)
self.assertEqual(panel.Close[-1], 13.68)

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

Expand Down Expand Up @@ -124,7 +124,7 @@ def test_yahoo(self):
start = datetime(2010, 1, 1)
end = datetime(2013, 1, 27)

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

@network
Expand Down Expand Up @@ -396,7 +396,7 @@ def test_fred(self):
end = datetime(2013, 1, 27)

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

self.assertRaises(Exception, web.DataReader, "NON EXISTENT SERIES",
'fred', start, end)
Expand Down
54 changes: 27 additions & 27 deletions pandas/io/tests/test_excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ def test_to_excel_multiindex_dates(self):
has_index_names=self.merge_cells)

tm.assert_frame_equal(tsframe, recons)
self.assertEquals(recons.index.names, ('time', 'foo'))
self.assertEqual(recons.index.names, ('time', 'foo'))

def test_to_excel_multiindex_no_write_index(self):
_skip_if_no_xlrd()
Expand Down Expand Up @@ -936,21 +936,21 @@ def test_to_excel_unicode_filename(self):

# wbk = xlrd.open_workbook(filename,
# formatting_info=True)
# self.assertEquals(["test1"], wbk.sheet_names())
# self.assertEqual(["test1"], wbk.sheet_names())
# ws = wbk.sheet_by_name('test1')
# self.assertEquals([(0, 1, 5, 7), (0, 1, 3, 5), (0, 1, 1, 3)],
# self.assertEqual([(0, 1, 5, 7), (0, 1, 3, 5), (0, 1, 1, 3)],
# ws.merged_cells)
# for i in range(0, 2):
# for j in range(0, 7):
# xfx = ws.cell_xf_index(0, 0)
# cell_xf = wbk.xf_list[xfx]
# font = wbk.font_list
# self.assertEquals(1, font[cell_xf.font_index].bold)
# self.assertEquals(1, cell_xf.border.top_line_style)
# self.assertEquals(1, cell_xf.border.right_line_style)
# self.assertEquals(1, cell_xf.border.bottom_line_style)
# self.assertEquals(1, cell_xf.border.left_line_style)
# self.assertEquals(2, cell_xf.alignment.hor_align)
# self.assertEqual(1, font[cell_xf.font_index].bold)
# self.assertEqual(1, cell_xf.border.top_line_style)
# self.assertEqual(1, cell_xf.border.right_line_style)
# self.assertEqual(1, cell_xf.border.bottom_line_style)
# self.assertEqual(1, cell_xf.border.left_line_style)
# self.assertEqual(2, cell_xf.alignment.hor_align)
# os.remove(filename)
# def test_to_excel_header_styling_xlsx(self):
# import StringIO
Expand Down Expand Up @@ -982,23 +982,23 @@ def test_to_excel_unicode_filename(self):
# filename = '__tmp_to_excel_header_styling_xlsx__.xlsx'
# pdf.to_excel(filename, 'test1')
# wbk = openpyxl.load_workbook(filename)
# self.assertEquals(["test1"], wbk.get_sheet_names())
# self.assertEqual(["test1"], wbk.get_sheet_names())
# ws = wbk.get_sheet_by_name('test1')
# xlsaddrs = ["%s2" % chr(i) for i in range(ord('A'), ord('H'))]
# xlsaddrs += ["A%s" % i for i in range(1, 6)]
# xlsaddrs += ["B1", "D1", "F1"]
# for xlsaddr in xlsaddrs:
# cell = ws.cell(xlsaddr)
# self.assertTrue(cell.style.font.bold)
# self.assertEquals(openpyxl.style.Border.BORDER_THIN,
# self.assertEqual(openpyxl.style.Border.BORDER_THIN,
# cell.style.borders.top.border_style)
# self.assertEquals(openpyxl.style.Border.BORDER_THIN,
# self.assertEqual(openpyxl.style.Border.BORDER_THIN,
# cell.style.borders.right.border_style)
# self.assertEquals(openpyxl.style.Border.BORDER_THIN,
# self.assertEqual(openpyxl.style.Border.BORDER_THIN,
# cell.style.borders.bottom.border_style)
# self.assertEquals(openpyxl.style.Border.BORDER_THIN,
# self.assertEqual(openpyxl.style.Border.BORDER_THIN,
# cell.style.borders.left.border_style)
# self.assertEquals(openpyxl.style.Alignment.HORIZONTAL_CENTER,
# self.assertEqual(openpyxl.style.Alignment.HORIZONTAL_CENTER,
# cell.style.alignment.horizontal)
# mergedcells_addrs = ["C1", "E1", "G1"]
# for maddr in mergedcells_addrs:
Expand Down Expand Up @@ -1109,17 +1109,17 @@ def test_to_excel_styleconverter(self):

xlsx_style = _OpenpyxlWriter._convert_to_style(hstyle)
self.assertTrue(xlsx_style.font.bold)
self.assertEquals(openpyxl.style.Border.BORDER_THIN,
self.assertEqual(openpyxl.style.Border.BORDER_THIN,
xlsx_style.borders.top.border_style)
self.assertEquals(openpyxl.style.Border.BORDER_THIN,
self.assertEqual(openpyxl.style.Border.BORDER_THIN,
xlsx_style.borders.right.border_style)
self.assertEquals(openpyxl.style.Border.BORDER_THIN,
self.assertEqual(openpyxl.style.Border.BORDER_THIN,
xlsx_style.borders.bottom.border_style)
self.assertEquals(openpyxl.style.Border.BORDER_THIN,
self.assertEqual(openpyxl.style.Border.BORDER_THIN,
xlsx_style.borders.left.border_style)
self.assertEquals(openpyxl.style.Alignment.HORIZONTAL_CENTER,
self.assertEqual(openpyxl.style.Alignment.HORIZONTAL_CENTER,
xlsx_style.alignment.horizontal)
self.assertEquals(openpyxl.style.Alignment.VERTICAL_TOP,
self.assertEqual(openpyxl.style.Alignment.VERTICAL_TOP,
xlsx_style.alignment.vertical)


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

xls_style = _XlwtWriter._convert_to_style(hstyle)
self.assertTrue(xls_style.font.bold)
self.assertEquals(xlwt.Borders.THIN, xls_style.borders.top)
self.assertEquals(xlwt.Borders.THIN, xls_style.borders.right)
self.assertEquals(xlwt.Borders.THIN, xls_style.borders.bottom)
self.assertEquals(xlwt.Borders.THIN, xls_style.borders.left)
self.assertEquals(xlwt.Alignment.HORZ_CENTER, xls_style.alignment.horz)
self.assertEquals(xlwt.Alignment.VERT_TOP, xls_style.alignment.vert)
self.assertEqual(xlwt.Borders.THIN, xls_style.borders.top)
self.assertEqual(xlwt.Borders.THIN, xls_style.borders.right)
self.assertEqual(xlwt.Borders.THIN, xls_style.borders.bottom)
self.assertEqual(xlwt.Borders.THIN, xls_style.borders.left)
self.assertEqual(xlwt.Alignment.HORZ_CENTER, xls_style.alignment.horz)
self.assertEqual(xlwt.Alignment.VERT_TOP, xls_style.alignment.vert)


class XlsxWriterTests(ExcelWriterBase, tm.TestCase):
Expand Down
Loading