From a19b8464d2a2882e7fb34c830d9a6582adbf8c99 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 6 Nov 2017 12:07:59 +0100 Subject: [PATCH] use self.assertEqual instead of self.assertEquals (deprecated) --- bpython/test/test_args.py | 2 +- bpython/test/test_config.py | 4 +- bpython/test/test_curtsies_parser.py | 6 +-- bpython/test/test_curtsies_repl.py | 8 ++-- bpython/test/test_interpreter.py | 6 +-- bpython/test/test_manual_readline.py | 62 ++++++++++++++-------------- bpython/test/test_simpleeval.py | 16 +++---- 7 files changed, 52 insertions(+), 52 deletions(-) diff --git a/bpython/test/test_args.py b/bpython/test/test_args.py index 9c89f73c9..52c613267 100644 --- a/bpython/test/test_args.py +++ b/bpython/test/test_args.py @@ -35,7 +35,7 @@ def test_exec_dunder_file(self): universal_newlines=True) (_, stderr) = p.communicate() - self.assertEquals(stderr.strip(), f.name) + self.assertEqual(stderr.strip(), f.name) def test_exec_nonascii_file(self): with tempfile.NamedTemporaryFile(mode="w") as f: diff --git a/bpython/test/test_config.py b/bpython/test/test_config.py index fc5b841ed..c4c3c8b83 100644 --- a/bpython/test/test_config.py +++ b/bpython/test/test_config.py @@ -30,13 +30,13 @@ def test_load_theme(self): struct.color_scheme = dict() config.load_theme(struct, TEST_THEME_PATH, struct.color_scheme, dict()) expected = {"keyword": "y"} - self.assertEquals(struct.color_scheme, expected) + self.assertEqual(struct.color_scheme, expected) defaults = {"name": "c"} expected.update(defaults) config.load_theme(struct, TEST_THEME_PATH, struct.color_scheme, defaults) - self.assertEquals(struct.color_scheme, expected) + self.assertEqual(struct.color_scheme, expected) def test_keybindings_default_contains_no_duplicates(self): struct = self.load_temp_config("") diff --git a/bpython/test/test_curtsies_parser.py b/bpython/test/test_curtsies_parser.py index 58d3b5424..019a7e0d4 100644 --- a/bpython/test/test_curtsies_parser.py +++ b/bpython/test/test_curtsies_parser.py @@ -10,15 +10,15 @@ class TestExecArgs(unittest.TestCase): def test_parse(self): - self.assertEquals(parse.parse('\x01y\x03print\x04'), yellow('print')) + self.assertEqual(parse.parse('\x01y\x03print\x04'), yellow('print')) - self.assertEquals( + self.assertEqual( parse.parse('\x01y\x03print\x04\x01c\x03 \x04\x01g\x031\x04\x01c' '\x03 \x04\x01Y\x03+\x04\x01c\x03 \x04\x01g\x032\x04'), yellow('print') + cyan(' ') + green('1') + cyan(' ') + bold(yellow('+')) + cyan(' ') + green(u'2')) def test_peal_off_string(self): - self.assertEquals(parse.peel_off_string('\x01RI\x03]\x04asdf'), + self.assertEqual(parse.peel_off_string('\x01RI\x03]\x04asdf'), ({'bg': 'I', 'string': ']', 'fg': 'R', 'colormarker': '\x01RI', 'bold': ''}, 'asdf')) diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py index 3cf25da85..e91fff022 100644 --- a/bpython/test/test_curtsies_repl.py +++ b/bpython/test/test_curtsies_repl.py @@ -82,10 +82,10 @@ def test_get_last_word(self): self.assertEqual(self.repl.current_line, 'abcde3') def test_last_word(self): - self.assertEquals(curtsiesrepl._last_word(''), '') - self.assertEquals(curtsiesrepl._last_word(' '), '') - self.assertEquals(curtsiesrepl._last_word('a'), 'a') - self.assertEquals(curtsiesrepl._last_word('a b'), 'b') + self.assertEqual(curtsiesrepl._last_word(''), '') + self.assertEqual(curtsiesrepl._last_word(' '), '') + self.assertEqual(curtsiesrepl._last_word('a'), 'a') + self.assertEqual(curtsiesrepl._last_word('a b'), 'b') # this is the behavior of bash - not currently implemented @unittest.skip diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py index 95feb8b51..48cb8ad55 100644 --- a/bpython/test/test_interpreter.py +++ b/bpython/test/test_interpreter.py @@ -54,7 +54,7 @@ def test_syntaxerror(self): '\n') self.assertMultiLineEqual(str(plain('').join(a)), str(expected)) - self.assertEquals(plain('').join(a), expected) + self.assertEqual(plain('').join(a), expected) def test_traceback(self): i, a = self.interp_errlog() @@ -79,7 +79,7 @@ def gfunc(): bold(red('NameError')) + ': ' + cyan(global_not_found) + '\n') self.assertMultiLineEqual(str(plain('').join(a)), str(expected)) - self.assertEquals(plain('').join(a), expected) + self.assertEqual(plain('').join(a), expected) @unittest.skipIf(py3, "runsource() accepts only unicode in Python 3") def test_runsource_bytes(self): @@ -123,7 +123,7 @@ def test_getsource_works_on_interactively_defined_functions(self): i.runsource(source) import inspect inspected_source = inspect.getsource(i.locals['foo']) - self.assertEquals(inspected_source, source) + self.assertEqual(inspected_source, source) @unittest.skipIf(py3, "encode only does anything in Python 2") def test_runsource_unicode_autoencode_and_noencode(self): diff --git a/bpython/test/test_manual_readline.py b/bpython/test/test_manual_readline.py index faf4b585f..705558d9a 100644 --- a/bpython/test/test_manual_readline.py +++ b/bpython/test/test_manual_readline.py @@ -20,7 +20,7 @@ def test_left_arrow_at_zero(self): pos = 0 expected = (pos, self._line) result = left_arrow(pos, self._line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_left_arrow_at_non_zero(self): for i in range(1, len(self._line)): @@ -32,25 +32,25 @@ def test_right_arrow_at_end(self): pos = len(self._line) expected = (pos, self._line) result = right_arrow(pos, self._line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_right_arrow_at_non_end(self): for i in range(len(self._line) - 1): expected = (i + 1, self._line) result = right_arrow(i, self._line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_beginning_of_line(self): expected = (0, self._line) for i in range(len(self._line)): result = beginning_of_line(i, self._line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_end_of_line(self): expected = (len(self._line), self._line) for i in range(len(self._line)): result = end_of_line(i, self._line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_forward_word(self): line = "going from here to_here" @@ -58,12 +58,12 @@ def test_forward_word(self): next_word_pos = 15 expected = (next_word_pos, line) result = forward_word(start_pos, line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) start_pos = 15 next_word_pos = 23 expected = (next_word_pos, line) result = forward_word(start_pos, line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_forward_word_tabs(self): line = "going from here to_here" @@ -71,12 +71,12 @@ def test_forward_word_tabs(self): next_word_pos = 15 expected = (next_word_pos, line) result = forward_word(start_pos, line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) start_pos = 15 next_word_pos = 28 expected = (next_word_pos, line) result = forward_word(start_pos, line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_forward_word_end(self): line = "going from here to_here" @@ -84,17 +84,17 @@ def test_forward_word_end(self): next_word_pos = 23 expected = (next_word_pos, line) result = forward_word(start_pos, line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) start_pos = 22 next_word_pos = 23 expected = (next_word_pos, line) result = forward_word(start_pos, line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) start_pos = 23 next_word_pos = 23 expected = (next_word_pos, line) result = forward_word(start_pos, line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_forward_word_empty(self): line = "" @@ -102,50 +102,50 @@ def test_forward_word_empty(self): next_word_pos = 0 expected = (next_word_pos, line) result = forward_word(start_pos, line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_back_word(self): line = "going to here from_here" start_pos = 14 prev_word_pos = 9 - self.assertEquals(line[start_pos], 'f') - self.assertEquals(line[prev_word_pos], 'h') + self.assertEqual(line[start_pos], 'f') + self.assertEqual(line[prev_word_pos], 'h') expected = (prev_word_pos, line) result = back_word(start_pos, line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_last_word_pos(self): line = "a word" expected = 2 result = last_word_pos(line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_last_word_pos_single_word(self): line = "word" expected = 0 result = last_word_pos(line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_delete(self): line = "deletion line" pos = 3 expected = (3, "deltion line") result = delete(pos, line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_delete_from_cursor_back(self): line = "everything before this will be deleted" expected = (0, "this will be deleted") result = delete_from_cursor_back(line.find("this"), line) - self.assertEquals(expected, result) + self.assertEqual(expected, result) def test_delete_from_cursor_forward(self): line = "everything after this will be deleted" pos = line.find("this") expected = (pos, "everything after ") result = delete_from_cursor_forward(line.find("this"), line)[:-1] - self.assertEquals(expected, result) - self.assertEquals(delete_from_cursor_forward(0, ''), (0, '', '')) + self.assertEqual(expected, result) + self.assertEqual(delete_from_cursor_forward(0, ''), (0, '', '')) def test_delete_rest_of_word(self): self.try_stages_kill([ @@ -184,7 +184,7 @@ def try_stages(self, strings, func): stages = [(s.index('|'), s.replace('|', '')) for s in strings] for (initial_pos, initial), (final_pos, final) in zip(stages[:-1], stages[1:]): - self.assertEquals(func(initial_pos, initial), (final_pos, final)) + self.assertEqual(func(initial_pos, initial), (final_pos, final)) def try_stages_kill(self, strings, func): if not all('|' in s for s in strings): @@ -193,7 +193,7 @@ def try_stages_kill(self, strings, func): stages = [(s.index('|'), s.replace('|', '')) for s in strings] for (initial_pos, initial), (final_pos, final) in zip(stages[:-1], stages[1:]): - self.assertEquals(func(initial_pos, initial)[:-1], + self.assertEqual(func(initial_pos, initial)[:-1], (final_pos, final)) def test_transpose_character_before_cursor(self): @@ -204,27 +204,27 @@ def test_transpose_character_before_cursor(self): "adf as|sdf"], transpose_character_before_cursor) def test_transpose_empty_line(self): - self.assertEquals(transpose_character_before_cursor(0, ''), + self.assertEqual(transpose_character_before_cursor(0, ''), (0, '')) def test_transpose_first_character(self): - self.assertEquals(transpose_character_before_cursor(0, 'a'), + self.assertEqual(transpose_character_before_cursor(0, 'a'), (0, 'a')) - self.assertEquals(transpose_character_before_cursor(0, 'as'), + self.assertEqual(transpose_character_before_cursor(0, 'as'), (0, 'as')) def test_transpose_end_of_line(self): - self.assertEquals(transpose_character_before_cursor(1, 'a'), + self.assertEqual(transpose_character_before_cursor(1, 'a'), (1, 'a')) - self.assertEquals(transpose_character_before_cursor(2, 'as'), + self.assertEqual(transpose_character_before_cursor(2, 'as'), (2, 'sa')) def test_transpose_word_before_cursor(self): pass def test_backspace(self): - self.assertEquals(backspace(2, 'as'), (1, 'a')) - self.assertEquals(backspace(3, 'as '), (2, 'as')) + self.assertEqual(backspace(2, 'as'), (1, 'a')) + self.assertEqual(backspace(3, 'as '), (2, 'as')) def test_delete_word_from_cursor_back(self): self.try_stages_kill([ diff --git a/bpython/test/test_simpleeval.py b/bpython/test/test_simpleeval.py index 9db2fbf9b..92107c060 100644 --- a/bpython/test/test_simpleeval.py +++ b/bpython/test/test_simpleeval.py @@ -188,17 +188,17 @@ class TestSafeGetAttribute(unittest.TestCase): def test_lookup_on_object(self): a = A() a.x = 1 - self.assertEquals(safe_get_attribute_new_style(a, 'x'), 1) - self.assertEquals(safe_get_attribute_new_style(a, 'a'), 'a') + self.assertEqual(safe_get_attribute_new_style(a, 'x'), 1) + self.assertEqual(safe_get_attribute_new_style(a, 'a'), 'a') b = B() b.y = 2 - self.assertEquals(safe_get_attribute_new_style(b, 'y'), 2) - self.assertEquals(safe_get_attribute_new_style(b, 'a'), 'a') - self.assertEquals(safe_get_attribute_new_style(b, 'b'), 'b') + self.assertEqual(safe_get_attribute_new_style(b, 'y'), 2) + self.assertEqual(safe_get_attribute_new_style(b, 'a'), 'a') + self.assertEqual(safe_get_attribute_new_style(b, 'b'), 'b') def test_avoid_running_properties(self): p = Property() - self.assertEquals(safe_get_attribute_new_style(p, 'prop'), + self.assertEqual(safe_get_attribute_new_style(p, 'prop'), Property.prop) @unittest.skipIf(py3, 'Old-style classes not in Python 3') @@ -211,7 +211,7 @@ class Old: def test_lookup_with_slots(self): s = Slots() s.s1 = 's1' - self.assertEquals(safe_get_attribute(s, 's1'), 's1') + self.assertEqual(safe_get_attribute(s, 's1'), 's1') self.assertIsInstance(safe_get_attribute_new_style(s, 's1'), member_descriptor) with self.assertRaises(AttributeError): @@ -232,7 +232,7 @@ def test_lookup_with_property_and_slots(self): sga = safe_get_attribute s = SlotsSubclass() self.assertIsInstance(sga(Slots, 's3'), property) - self.assertEquals(safe_get_attribute(s, 's3'), + self.assertEqual(safe_get_attribute(s, 's3'), Slots.__dict__['s3']) self.assertIsInstance(sga(SlotsSubclass, 's3'), property)