Skip to content

Commit 1c5484f

Browse files
floklisebastinas
flokli
authored and
sebastinas
committed
use self.assertEqual instead of self.assertEquals (deprecated) (bpython#715)
1 parent 2349722 commit 1c5484f

7 files changed

+52
-52
lines changed

‎bpython/test/test_args.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_exec_dunder_file(self):
3535
universal_newlines=True)
3636
(_, stderr) = p.communicate()
3737

38-
self.assertEquals(stderr.strip(), f.name)
38+
self.assertEqual(stderr.strip(), f.name)
3939

4040
def test_exec_nonascii_file(self):
4141
with tempfile.NamedTemporaryFile(mode="w") as f:

‎bpython/test/test_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ def test_load_theme(self):
3030
struct.color_scheme = dict()
3131
config.load_theme(struct, TEST_THEME_PATH, struct.color_scheme, dict())
3232
expected = {"keyword": "y"}
33-
self.assertEquals(struct.color_scheme, expected)
33+
self.assertEqual(struct.color_scheme, expected)
3434

3535
defaults = {"name": "c"}
3636
expected.update(defaults)
3737
config.load_theme(struct, TEST_THEME_PATH, struct.color_scheme,
3838
defaults)
39-
self.assertEquals(struct.color_scheme, expected)
39+
self.assertEqual(struct.color_scheme, expected)
4040

4141
def test_keybindings_default_contains_no_duplicates(self):
4242
struct = self.load_temp_config("")

‎bpython/test/test_curtsies_parser.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
class TestExecArgs(unittest.TestCase):
1111

1212
def test_parse(self):
13-
self.assertEquals(parse.parse('\x01y\x03print\x04'), yellow('print'))
13+
self.assertEqual(parse.parse('\x01y\x03print\x04'), yellow('print'))
1414

15-
self.assertEquals(
15+
self.assertEqual(
1616
parse.parse('\x01y\x03print\x04\x01c\x03 \x04\x01g\x031\x04\x01c'
1717
'\x03 \x04\x01Y\x03+\x04\x01c\x03 \x04\x01g\x032\x04'),
1818
yellow('print') + cyan(' ') + green('1') + cyan(' ') +
1919
bold(yellow('+')) + cyan(' ') + green(u'2'))
2020

2121
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'),
2323
({'bg': 'I', 'string': ']', 'fg': 'R', 'colormarker':
2424
'\x01RI', 'bold': ''}, 'asdf'))

‎bpython/test/test_curtsies_repl.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ def test_get_last_word(self):
8282
self.assertEqual(self.repl.current_line, 'abcde3')
8383

8484
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')
8989

9090
# this is the behavior of bash - not currently implemented
9191
@unittest.skip

‎bpython/test/test_interpreter.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_syntaxerror(self):
5454
'\n')
5555

5656
self.assertMultiLineEqual(str(plain('').join(a)), str(expected))
57-
self.assertEquals(plain('').join(a), expected)
57+
self.assertEqual(plain('').join(a), expected)
5858

5959
def test_traceback(self):
6060
i, a = self.interp_errlog()
@@ -79,7 +79,7 @@ def gfunc():
7979
bold(red('NameError')) + ': ' + cyan(global_not_found) + '\n')
8080

8181
self.assertMultiLineEqual(str(plain('').join(a)), str(expected))
82-
self.assertEquals(plain('').join(a), expected)
82+
self.assertEqual(plain('').join(a), expected)
8383

8484
@unittest.skipIf(py3, "runsource() accepts only unicode in Python 3")
8585
def test_runsource_bytes(self):
@@ -123,7 +123,7 @@ def test_getsource_works_on_interactively_defined_functions(self):
123123
i.runsource(source)
124124
import inspect
125125
inspected_source = inspect.getsource(i.locals['foo'])
126-
self.assertEquals(inspected_source, source)
126+
self.assertEqual(inspected_source, source)
127127

128128
@unittest.skipIf(py3, "encode only does anything in Python 2")
129129
def test_runsource_unicode_autoencode_and_noencode(self):

‎bpython/test/test_manual_readline.py

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_left_arrow_at_zero(self):
2020
pos = 0
2121
expected = (pos, self._line)
2222
result = left_arrow(pos, self._line)
23-
self.assertEquals(expected, result)
23+
self.assertEqual(expected, result)
2424

2525
def test_left_arrow_at_non_zero(self):
2626
for i in range(1, len(self._line)):
@@ -32,120 +32,120 @@ def test_right_arrow_at_end(self):
3232
pos = len(self._line)
3333
expected = (pos, self._line)
3434
result = right_arrow(pos, self._line)
35-
self.assertEquals(expected, result)
35+
self.assertEqual(expected, result)
3636

3737
def test_right_arrow_at_non_end(self):
3838
for i in range(len(self._line) - 1):
3939
expected = (i + 1, self._line)
4040
result = right_arrow(i, self._line)
41-
self.assertEquals(expected, result)
41+
self.assertEqual(expected, result)
4242

4343
def test_beginning_of_line(self):
4444
expected = (0, self._line)
4545
for i in range(len(self._line)):
4646
result = beginning_of_line(i, self._line)
47-
self.assertEquals(expected, result)
47+
self.assertEqual(expected, result)
4848

4949
def test_end_of_line(self):
5050
expected = (len(self._line), self._line)
5151
for i in range(len(self._line)):
5252
result = end_of_line(i, self._line)
53-
self.assertEquals(expected, result)
53+
self.assertEqual(expected, result)
5454

5555
def test_forward_word(self):
5656
line = "going from here to_here"
5757
start_pos = 11
5858
next_word_pos = 15
5959
expected = (next_word_pos, line)
6060
result = forward_word(start_pos, line)
61-
self.assertEquals(expected, result)
61+
self.assertEqual(expected, result)
6262
start_pos = 15
6363
next_word_pos = 23
6464
expected = (next_word_pos, line)
6565
result = forward_word(start_pos, line)
66-
self.assertEquals(expected, result)
66+
self.assertEqual(expected, result)
6767

6868
def test_forward_word_tabs(self):
6969
line = "going from here to_here"
7070
start_pos = 11
7171
next_word_pos = 15
7272
expected = (next_word_pos, line)
7373
result = forward_word(start_pos, line)
74-
self.assertEquals(expected, result)
74+
self.assertEqual(expected, result)
7575
start_pos = 15
7676
next_word_pos = 28
7777
expected = (next_word_pos, line)
7878
result = forward_word(start_pos, line)
79-
self.assertEquals(expected, result)
79+
self.assertEqual(expected, result)
8080

8181
def test_forward_word_end(self):
8282
line = "going from here to_here"
8383
start_pos = 16
8484
next_word_pos = 23
8585
expected = (next_word_pos, line)
8686
result = forward_word(start_pos, line)
87-
self.assertEquals(expected, result)
87+
self.assertEqual(expected, result)
8888
start_pos = 22
8989
next_word_pos = 23
9090
expected = (next_word_pos, line)
9191
result = forward_word(start_pos, line)
92-
self.assertEquals(expected, result)
92+
self.assertEqual(expected, result)
9393
start_pos = 23
9494
next_word_pos = 23
9595
expected = (next_word_pos, line)
9696
result = forward_word(start_pos, line)
97-
self.assertEquals(expected, result)
97+
self.assertEqual(expected, result)
9898

9999
def test_forward_word_empty(self):
100100
line = ""
101101
start_pos = 0
102102
next_word_pos = 0
103103
expected = (next_word_pos, line)
104104
result = forward_word(start_pos, line)
105-
self.assertEquals(expected, result)
105+
self.assertEqual(expected, result)
106106

107107
def test_back_word(self):
108108
line = "going to here from_here"
109109
start_pos = 14
110110
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')
113113
expected = (prev_word_pos, line)
114114
result = back_word(start_pos, line)
115-
self.assertEquals(expected, result)
115+
self.assertEqual(expected, result)
116116

117117
def test_last_word_pos(self):
118118
line = "a word"
119119
expected = 2
120120
result = last_word_pos(line)
121-
self.assertEquals(expected, result)
121+
self.assertEqual(expected, result)
122122

123123
def test_last_word_pos_single_word(self):
124124
line = "word"
125125
expected = 0
126126
result = last_word_pos(line)
127-
self.assertEquals(expected, result)
127+
self.assertEqual(expected, result)
128128

129129
def test_delete(self):
130130
line = "deletion line"
131131
pos = 3
132132
expected = (3, "deltion line")
133133
result = delete(pos, line)
134-
self.assertEquals(expected, result)
134+
self.assertEqual(expected, result)
135135

136136
def test_delete_from_cursor_back(self):
137137
line = "everything before this will be deleted"
138138
expected = (0, "this will be deleted")
139139
result = delete_from_cursor_back(line.find("this"), line)
140-
self.assertEquals(expected, result)
140+
self.assertEqual(expected, result)
141141

142142
def test_delete_from_cursor_forward(self):
143143
line = "everything after this will be deleted"
144144
pos = line.find("this")
145145
expected = (pos, "everything after ")
146146
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, '', ''))
149149

150150
def test_delete_rest_of_word(self):
151151
self.try_stages_kill([
@@ -184,7 +184,7 @@ def try_stages(self, strings, func):
184184
stages = [(s.index('|'), s.replace('|', '')) for s in strings]
185185
for (initial_pos, initial), (final_pos, final) in zip(stages[:-1],
186186
stages[1:]):
187-
self.assertEquals(func(initial_pos, initial), (final_pos, final))
187+
self.assertEqual(func(initial_pos, initial), (final_pos, final))
188188

189189
def try_stages_kill(self, strings, func):
190190
if not all('|' in s for s in strings):
@@ -193,7 +193,7 @@ def try_stages_kill(self, strings, func):
193193
stages = [(s.index('|'), s.replace('|', '')) for s in strings]
194194
for (initial_pos, initial), (final_pos, final) in zip(stages[:-1],
195195
stages[1:]):
196-
self.assertEquals(func(initial_pos, initial)[:-1],
196+
self.assertEqual(func(initial_pos, initial)[:-1],
197197
(final_pos, final))
198198

199199
def test_transpose_character_before_cursor(self):
@@ -204,27 +204,27 @@ def test_transpose_character_before_cursor(self):
204204
"adf as|sdf"], transpose_character_before_cursor)
205205

206206
def test_transpose_empty_line(self):
207-
self.assertEquals(transpose_character_before_cursor(0, ''),
207+
self.assertEqual(transpose_character_before_cursor(0, ''),
208208
(0, ''))
209209

210210
def test_transpose_first_character(self):
211-
self.assertEquals(transpose_character_before_cursor(0, 'a'),
211+
self.assertEqual(transpose_character_before_cursor(0, 'a'),
212212
(0, 'a'))
213-
self.assertEquals(transpose_character_before_cursor(0, 'as'),
213+
self.assertEqual(transpose_character_before_cursor(0, 'as'),
214214
(0, 'as'))
215215

216216
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'),
218218
(1, 'a'))
219-
self.assertEquals(transpose_character_before_cursor(2, 'as'),
219+
self.assertEqual(transpose_character_before_cursor(2, 'as'),
220220
(2, 'sa'))
221221

222222
def test_transpose_word_before_cursor(self):
223223
pass
224224

225225
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'))
228228

229229
def test_delete_word_from_cursor_back(self):
230230
self.try_stages_kill([

‎bpython/test/test_simpleeval.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,17 +188,17 @@ class TestSafeGetAttribute(unittest.TestCase):
188188
def test_lookup_on_object(self):
189189
a = A()
190190
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')
193193
b = B()
194194
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')
198198

199199
def test_avoid_running_properties(self):
200200
p = Property()
201-
self.assertEquals(safe_get_attribute_new_style(p, 'prop'),
201+
self.assertEqual(safe_get_attribute_new_style(p, 'prop'),
202202
Property.prop)
203203

204204
@unittest.skipIf(py3, 'Old-style classes not in Python 3')
@@ -211,7 +211,7 @@ class Old:
211211
def test_lookup_with_slots(self):
212212
s = Slots()
213213
s.s1 = 's1'
214-
self.assertEquals(safe_get_attribute(s, 's1'), 's1')
214+
self.assertEqual(safe_get_attribute(s, 's1'), 's1')
215215
self.assertIsInstance(safe_get_attribute_new_style(s, 's1'),
216216
member_descriptor)
217217
with self.assertRaises(AttributeError):
@@ -232,7 +232,7 @@ def test_lookup_with_property_and_slots(self):
232232
sga = safe_get_attribute
233233
s = SlotsSubclass()
234234
self.assertIsInstance(sga(Slots, 's3'), property)
235-
self.assertEquals(safe_get_attribute(s, 's3'),
235+
self.assertEqual(safe_get_attribute(s, 's3'),
236236
Slots.__dict__['s3'])
237237
self.assertIsInstance(sga(SlotsSubclass, 's3'), property)
238238

0 commit comments

Comments
 (0)