GeezerVison is showing github.com — use self.assertEqual instead of self.assertEquals (deprecated) (#715) · SivanSong/bpython@1c5484f
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: bpython/test/test_args.py +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -35,7 +35,7 @@ def test_exec_dunder_file(self): | 35 | 35 | universal_newlines=True) | 36 | 36 | (_, stderr) = p.communicate() | 37 | 37 |
| 38 | | - self.assertEquals(stderr.strip(), f.name) | | 38 | + self.assertEqual(stderr.strip(), f.name) | 39 | 39 |
| 40 | 40 | def test_exec_nonascii_file(self): | 41 | 41 | with tempfile.NamedTemporaryFile(mode="w") as f: | |
Collapse file Copy file name to clipboardExpand all lines: bpython/test/test_config.py +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -30,13 +30,13 @@ def test_load_theme(self): | 30 | 30 | struct.color_scheme = dict() | 31 | 31 | config.load_theme(struct, TEST_THEME_PATH, struct.color_scheme, dict()) | 32 | 32 | expected = {"keyword": "y"} | 33 | | - self.assertEquals(struct.color_scheme, expected) | | 33 | + self.assertEqual(struct.color_scheme, expected) | 34 | 34 |
| 35 | 35 | defaults = {"name": "c"} | 36 | 36 | expected.update(defaults) | 37 | 37 | config.load_theme(struct, TEST_THEME_PATH, struct.color_scheme, | 38 | 38 | defaults) | 39 | | - self.assertEquals(struct.color_scheme, expected) | | 39 | + self.assertEqual(struct.color_scheme, expected) | 40 | 40 |
| 41 | 41 | def test_keybindings_default_contains_no_duplicates(self): | 42 | 42 | struct = self.load_temp_config("") | |
Collapse file Copy file name to clipboardExpand all lines: bpython/test/test_curtsies_parser.py +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 10 | 10 | class TestExecArgs(unittest.TestCase): | 11 | 11 |
| 12 | 12 | def test_parse(self): | 13 | | - self.assertEquals(parse.parse('\x01y\x03print\x04'), yellow('print')) | | 13 | + self.assertEqual(parse.parse('\x01y\x03print\x04'), yellow('print')) | 14 | 14 |
| 15 | | - self.assertEquals( | | 15 | + self.assertEqual( | 16 | 16 | parse.parse('\x01y\x03print\x04\x01c\x03 \x04\x01g\x031\x04\x01c' | 17 | 17 | '\x03 \x04\x01Y\x03+\x04\x01c\x03 \x04\x01g\x032\x04'), | 18 | 18 | yellow('print') + cyan(' ') + green('1') + cyan(' ') + | 19 | 19 | bold(yellow('+')) + cyan(' ') + green(u'2')) | 20 | 20 |
| 21 | 21 | def test_peal_off_string(self): | 22 | | - self.assertEquals(parse.peel_off_string('\x01RI\x03]\x04asdf'), | | 22 | + self.assertEqual(parse.peel_off_string('\x01RI\x03]\x04asdf'), | 23 | 23 | ({'bg': 'I', 'string': ']', 'fg': 'R', 'colormarker': | 24 | 24 | '\x01RI', 'bold': ''}, 'asdf')) |
Collapse file Copy file name to clipboardExpand all lines: bpython/test/test_curtsies_repl.py +4-4Lines changed: 4 additions & 4 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -82,10 +82,10 @@ def test_get_last_word(self): | 82 | 82 | self.assertEqual(self.repl.current_line, 'abcde3') | 83 | 83 |
| 84 | 84 | def test_last_word(self): | 85 | | - self.assertEquals(curtsiesrepl._last_word(''), '') | 86 | | - self.assertEquals(curtsiesrepl._last_word(' '), '') | 87 | | - self.assertEquals(curtsiesrepl._last_word('a'), 'a') | 88 | | - self.assertEquals(curtsiesrepl._last_word('a b'), 'b') | | 85 | + self.assertEqual(curtsiesrepl._last_word(''), '') | | 86 | + self.assertEqual(curtsiesrepl._last_word(' '), '') | | 87 | + self.assertEqual(curtsiesrepl._last_word('a'), 'a') | | 88 | + self.assertEqual(curtsiesrepl._last_word('a b'), 'b') | 89 | 89 |
| 90 | 90 | # this is the behavior of bash - not currently implemented | 91 | 91 | @unittest.skip | |
Collapse file Copy file name to clipboardExpand all lines: bpython/test/test_interpreter.py +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -54,7 +54,7 @@ def test_syntaxerror(self): | 54 | 54 | '\n') | 55 | 55 |
| 56 | 56 | self.assertMultiLineEqual(str(plain('').join(a)), str(expected)) | 57 | | - self.assertEquals(plain('').join(a), expected) | | 57 | + self.assertEqual(plain('').join(a), expected) | 58 | 58 |
| 59 | 59 | def test_traceback(self): | 60 | 60 | i, a = self.interp_errlog() | @@ -79,7 +79,7 @@ def gfunc(): | 79 | 79 | bold(red('NameError')) + ': ' + cyan(global_not_found) + '\n') | 80 | 80 |
| 81 | 81 | self.assertMultiLineEqual(str(plain('').join(a)), str(expected)) | 82 | | - self.assertEquals(plain('').join(a), expected) | | 82 | + self.assertEqual(plain('').join(a), expected) | 83 | 83 |
| 84 | 84 | @unittest.skipIf(py3, "runsource() accepts only unicode in Python 3") | 85 | 85 | def test_runsource_bytes(self): | @@ -123,7 +123,7 @@ def test_getsource_works_on_interactively_defined_functions(self): | 123 | 123 | i.runsource(source) | 124 | 124 | import inspect | 125 | 125 | inspected_source = inspect.getsource(i.locals['foo']) | 126 | | - self.assertEquals(inspected_source, source) | | 126 | + self.assertEqual(inspected_source, source) | 127 | 127 |
| 128 | 128 | @unittest.skipIf(py3, "encode only does anything in Python 2") | 129 | 129 | def test_runsource_unicode_autoencode_and_noencode(self): | |
Collapse file Copy file name to clipboardExpand all lines: bpython/test/test_manual_readline.py +31-31Lines changed: 31 additions & 31 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -20,7 +20,7 @@ def test_left_arrow_at_zero(self): | 20 | 20 | pos = 0 | 21 | 21 | expected = (pos, self._line) | 22 | 22 | result = left_arrow(pos, self._line) | 23 | | - self.assertEquals(expected, result) | | 23 | + self.assertEqual(expected, result) | 24 | 24 |
| 25 | 25 | def test_left_arrow_at_non_zero(self): | 26 | 26 | for i in range(1, len(self._line)): | @@ -32,120 +32,120 @@ def test_right_arrow_at_end(self): | 32 | 32 | pos = len(self._line) | 33 | 33 | expected = (pos, self._line) | 34 | 34 | result = right_arrow(pos, self._line) | 35 | | - self.assertEquals(expected, result) | | 35 | + self.assertEqual(expected, result) | 36 | 36 |
| 37 | 37 | def test_right_arrow_at_non_end(self): | 38 | 38 | for i in range(len(self._line) - 1): | 39 | 39 | expected = (i + 1, self._line) | 40 | 40 | result = right_arrow(i, self._line) | 41 | | - self.assertEquals(expected, result) | | 41 | + self.assertEqual(expected, result) | 42 | 42 |
| 43 | 43 | def test_beginning_of_line(self): | 44 | 44 | expected = (0, self._line) | 45 | 45 | for i in range(len(self._line)): | 46 | 46 | result = beginning_of_line(i, self._line) | 47 | | - self.assertEquals(expected, result) | | 47 | + self.assertEqual(expected, result) | 48 | 48 |
| 49 | 49 | def test_end_of_line(self): | 50 | 50 | expected = (len(self._line), self._line) | 51 | 51 | for i in range(len(self._line)): | 52 | 52 | result = end_of_line(i, self._line) | 53 | | - self.assertEquals(expected, result) | | 53 | + self.assertEqual(expected, result) | 54 | 54 |
| 55 | 55 | def test_forward_word(self): | 56 | 56 | line = "going from here to_here" | 57 | 57 | start_pos = 11 | 58 | 58 | next_word_pos = 15 | 59 | 59 | expected = (next_word_pos, line) | 60 | 60 | result = forward_word(start_pos, line) | 61 | | - self.assertEquals(expected, result) | | 61 | + self.assertEqual(expected, result) | 62 | 62 | start_pos = 15 | 63 | 63 | next_word_pos = 23 | 64 | 64 | expected = (next_word_pos, line) | 65 | 65 | result = forward_word(start_pos, line) | 66 | | - self.assertEquals(expected, result) | | 66 | + self.assertEqual(expected, result) | 67 | 67 |
| 68 | 68 | def test_forward_word_tabs(self): | 69 | 69 | line = "going from here to_here" | 70 | 70 | start_pos = 11 | 71 | 71 | next_word_pos = 15 | 72 | 72 | expected = (next_word_pos, line) | 73 | 73 | result = forward_word(start_pos, line) | 74 | | - self.assertEquals(expected, result) | | 74 | + self.assertEqual(expected, result) | 75 | 75 | start_pos = 15 | 76 | 76 | next_word_pos = 28 | 77 | 77 | expected = (next_word_pos, line) | 78 | 78 | result = forward_word(start_pos, line) | 79 | | - self.assertEquals(expected, result) | | 79 | + self.assertEqual(expected, result) | 80 | 80 |
| 81 | 81 | def test_forward_word_end(self): | 82 | 82 | line = "going from here to_here" | 83 | 83 | start_pos = 16 | 84 | 84 | next_word_pos = 23 | 85 | 85 | expected = (next_word_pos, line) | 86 | 86 | result = forward_word(start_pos, line) | 87 | | - self.assertEquals(expected, result) | | 87 | + self.assertEqual(expected, result) | 88 | 88 | start_pos = 22 | 89 | 89 | next_word_pos = 23 | 90 | 90 | expected = (next_word_pos, line) | 91 | 91 | result = forward_word(start_pos, line) | 92 | | - self.assertEquals(expected, result) | | 92 | + self.assertEqual(expected, result) | 93 | 93 | start_pos = 23 | 94 | 94 | next_word_pos = 23 | 95 | 95 | expected = (next_word_pos, line) | 96 | 96 | result = forward_word(start_pos, line) | 97 | | - self.assertEquals(expected, result) | | 97 | + self.assertEqual(expected, result) | 98 | 98 |
| 99 | 99 | def test_forward_word_empty(self): | 100 | 100 | line = "" | 101 | 101 | start_pos = 0 | 102 | 102 | next_word_pos = 0 | 103 | 103 | expected = (next_word_pos, line) | 104 | 104 | result = forward_word(start_pos, line) | 105 | | - self.assertEquals(expected, result) | | 105 | + self.assertEqual(expected, result) | 106 | 106 |
| 107 | 107 | def test_back_word(self): | 108 | 108 | line = "going to here from_here" | 109 | 109 | start_pos = 14 | 110 | 110 | prev_word_pos = 9 | 111 | | - self.assertEquals(line[start_pos], 'f') | 112 | | - self.assertEquals(line[prev_word_pos], 'h') | | 111 | + self.assertEqual(line[start_pos], 'f') | | 112 | + self.assertEqual(line[prev_word_pos], 'h') | 113 | 113 | expected = (prev_word_pos, line) | 114 | 114 | result = back_word(start_pos, line) | 115 | | - self.assertEquals(expected, result) | | 115 | + self.assertEqual(expected, result) | 116 | 116 |
| 117 | 117 | def test_last_word_pos(self): | 118 | 118 | line = "a word" | 119 | 119 | expected = 2 | 120 | 120 | result = last_word_pos(line) | 121 | | - self.assertEquals(expected, result) | | 121 | + self.assertEqual(expected, result) | 122 | 122 |
| 123 | 123 | def test_last_word_pos_single_word(self): | 124 | 124 | line = "word" | 125 | 125 | expected = 0 | 126 | 126 | result = last_word_pos(line) | 127 | | - self.assertEquals(expected, result) | | 127 | + self.assertEqual(expected, result) | 128 | 128 |
| 129 | 129 | def test_delete(self): | 130 | 130 | line = "deletion line" | 131 | 131 | pos = 3 | 132 | 132 | expected = (3, "deltion line") | 133 | 133 | result = delete(pos, line) | 134 | | - self.assertEquals(expected, result) | | 134 | + self.assertEqual(expected, result) | 135 | 135 |
| 136 | 136 | def test_delete_from_cursor_back(self): | 137 | 137 | line = "everything before this will be deleted" | 138 | 138 | expected = (0, "this will be deleted") | 139 | 139 | result = delete_from_cursor_back(line.find("this"), line) | 140 | | - self.assertEquals(expected, result) | | 140 | + self.assertEqual(expected, result) | 141 | 141 |
| 142 | 142 | def test_delete_from_cursor_forward(self): | 143 | 143 | line = "everything after this will be deleted" | 144 | 144 | pos = line.find("this") | 145 | 145 | expected = (pos, "everything after ") | 146 | 146 | result = delete_from_cursor_forward(line.find("this"), line)[:-1] | 147 | | - self.assertEquals(expected, result) | 148 | | - self.assertEquals(delete_from_cursor_forward(0, ''), (0, '', '')) | | 147 | + self.assertEqual(expected, result) | | 148 | + self.assertEqual(delete_from_cursor_forward(0, ''), (0, '', '')) | 149 | 149 |
| 150 | 150 | def test_delete_rest_of_word(self): | 151 | 151 | self.try_stages_kill([ | @@ -184,7 +184,7 @@ def try_stages(self, strings, func): | 184 | 184 | stages = [(s.index('|'), s.replace('|', '')) for s in strings] | 185 | 185 | for (initial_pos, initial), (final_pos, final) in zip(stages[:-1], | 186 | 186 | stages[1:]): | 187 | | - self.assertEquals(func(initial_pos, initial), (final_pos, final)) | | 187 | + self.assertEqual(func(initial_pos, initial), (final_pos, final)) | 188 | 188 |
| 189 | 189 | def try_stages_kill(self, strings, func): | 190 | 190 | if not all('|' in s for s in strings): | @@ -193,7 +193,7 @@ def try_stages_kill(self, strings, func): | 193 | 193 | stages = [(s.index('|'), s.replace('|', '')) for s in strings] | 194 | 194 | for (initial_pos, initial), (final_pos, final) in zip(stages[:-1], | 195 | 195 | stages[1:]): | 196 | | - self.assertEquals(func(initial_pos, initial)[:-1], | | 196 | + self.assertEqual(func(initial_pos, initial)[:-1], | 197 | 197 | (final_pos, final)) | 198 | 198 |
| 199 | 199 | def test_transpose_character_before_cursor(self): | @@ -204,27 +204,27 @@ def test_transpose_character_before_cursor(self): | 204 | 204 | "adf as|sdf"], transpose_character_before_cursor) | 205 | 205 |
| 206 | 206 | def test_transpose_empty_line(self): | 207 | | - self.assertEquals(transpose_character_before_cursor(0, ''), | | 207 | + self.assertEqual(transpose_character_before_cursor(0, ''), | 208 | 208 | (0, '')) | 209 | 209 |
| 210 | 210 | def test_transpose_first_character(self): | 211 | | - self.assertEquals(transpose_character_before_cursor(0, 'a'), | | 211 | + self.assertEqual(transpose_character_before_cursor(0, 'a'), | 212 | 212 | (0, 'a')) | 213 | | - self.assertEquals(transpose_character_before_cursor(0, 'as'), | | 213 | + self.assertEqual(transpose_character_before_cursor(0, 'as'), | 214 | 214 | (0, 'as')) | 215 | 215 |
| 216 | 216 | def test_transpose_end_of_line(self): | 217 | | - self.assertEquals(transpose_character_before_cursor(1, 'a'), | | 217 | + self.assertEqual(transpose_character_before_cursor(1, 'a'), | 218 | 218 | (1, 'a')) | 219 | | - self.assertEquals(transpose_character_before_cursor(2, 'as'), | | 219 | + self.assertEqual(transpose_character_before_cursor(2, 'as'), | 220 | 220 | (2, 'sa')) | 221 | 221 |
| 222 | 222 | def test_transpose_word_before_cursor(self): | 223 | 223 | pass | 224 | 224 |
| 225 | 225 | def test_backspace(self): | 226 | | - self.assertEquals(backspace(2, 'as'), (1, 'a')) | 227 | | - self.assertEquals(backspace(3, 'as '), (2, 'as')) | | 226 | + self.assertEqual(backspace(2, 'as'), (1, 'a')) | | 227 | + self.assertEqual(backspace(3, 'as '), (2, 'as')) | 228 | 228 |
| 229 | 229 | def test_delete_word_from_cursor_back(self): | 230 | 230 | self.try_stages_kill([ | |
Collapse file Copy file name to clipboardExpand all lines: bpython/test/test_simpleeval.py +8-8Lines changed: 8 additions & 8 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -188,17 +188,17 @@ class TestSafeGetAttribute(unittest.TestCase): | 188 | 188 | def test_lookup_on_object(self): | 189 | 189 | a = A() | 190 | 190 | a.x = 1 | 191 | | - self.assertEquals(safe_get_attribute_new_style(a, 'x'), 1) | 192 | | - self.assertEquals(safe_get_attribute_new_style(a, 'a'), 'a') | | 191 | + self.assertEqual(safe_get_attribute_new_style(a, 'x'), 1) | | 192 | + self.assertEqual(safe_get_attribute_new_style(a, 'a'), 'a') | 193 | 193 | b = B() | 194 | 194 | b.y = 2 | 195 | | - self.assertEquals(safe_get_attribute_new_style(b, 'y'), 2) | 196 | | - self.assertEquals(safe_get_attribute_new_style(b, 'a'), 'a') | 197 | | - self.assertEquals(safe_get_attribute_new_style(b, 'b'), 'b') | | 195 | + self.assertEqual(safe_get_attribute_new_style(b, 'y'), 2) | | 196 | + self.assertEqual(safe_get_attribute_new_style(b, 'a'), 'a') | | 197 | + self.assertEqual(safe_get_attribute_new_style(b, 'b'), 'b') | 198 | 198 |
| 199 | 199 | def test_avoid_running_properties(self): | 200 | 200 | p = Property() | 201 | | - self.assertEquals(safe_get_attribute_new_style(p, 'prop'), | | 201 | + self.assertEqual(safe_get_attribute_new_style(p, 'prop'), | 202 | 202 | Property.prop) | 203 | 203 |
| 204 | 204 | @unittest.skipIf(py3, 'Old-style classes not in Python 3') | @@ -211,7 +211,7 @@ class Old: | 211 | 211 | def test_lookup_with_slots(self): | 212 | 212 | s = Slots() | 213 | 213 | s.s1 = 's1' | 214 | | - self.assertEquals(safe_get_attribute(s, 's1'), 's1') | | 214 | + self.assertEqual(safe_get_attribute(s, 's1'), 's1') | 215 | 215 | self.assertIsInstance(safe_get_attribute_new_style(s, 's1'), | 216 | 216 | member_descriptor) | 217 | 217 | with self.assertRaises(AttributeError): | @@ -232,7 +232,7 @@ def test_lookup_with_property_and_slots(self): | 232 | 232 | sga = safe_get_attribute | 233 | 233 | s = SlotsSubclass() | 234 | 234 | self.assertIsInstance(sga(Slots, 's3'), property) | 235 | | - self.assertEquals(safe_get_attribute(s, 's3'), | | 235 | + self.assertEqual(safe_get_attribute(s, 's3'), | 236 | 236 | Slots.__dict__['s3']) | 237 | 237 | self.assertIsInstance(sga(SlotsSubclass, 's3'), property) | 238 | 238 |
| |
|