Skip to content

Commit ee2ab57

Browse files
sebastinassebastinas
committed
Use range everywhere
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
1 parent 301a354 commit ee2ab57

6 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎bpython/cli.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ def clear_wrapped_lines(self):
444444
# curses does not handle this on its own. Sad.
445445
height, width = self.scr.getmaxyx()
446446
max_y = min(self.iy + (self.ix + len(self.s)) // width + 1, height)
447-
for y in xrange(self.iy + 1, max_y):
447+
for y in range(self.iy + 1, max_y):
448448
self.scr.move(y, 0)
449449
self.scr.clrtoeol()
450450

@@ -660,7 +660,7 @@ def get_line(self):
660660
self.iy, self.ix = self.scr.getyx()
661661

662662
if not self.paste_mode:
663-
for _ in xrange(self.next_indentation()):
663+
for _ in range(self.next_indentation()):
664664
self.p_key('\t')
665665

666666
self.cpos = 0
@@ -1156,7 +1156,7 @@ def reprint_line(self, lineno, tokens):
11561156

11571157
real_lineno = self.iy
11581158
height, width = self.scr.getmaxyx()
1159-
for i in xrange(lineno, len(self.buffer)):
1159+
for i in range(lineno, len(self.buffer)):
11601160
string = self.buffer[i]
11611161
# 4 = length of prompt
11621162
length = len(string.encode(getpreferredencoding())) + 4
@@ -1223,7 +1223,7 @@ def reevaluate(self):
12231223
self.scr.refresh()
12241224

12251225
if self.buffer:
1226-
for _ in xrange(indent):
1226+
for _ in range(indent):
12271227
self.tab()
12281228

12291229
self.evaluating = False
@@ -1517,7 +1517,7 @@ def send_current_line_to_editor(self):
15171517
self.scr.refresh()
15181518

15191519
if self.buffer:
1520-
for _ in xrange(indent):
1520+
for _ in range(indent):
15211521
self.tab()
15221522

15231523
self.print_line(self.s)

‎bpython/history.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def forward(self, start=True, search=False, target=None,
127127
def find_match_forward(self, search_term, include_current=False):
128128
add = 0 if include_current else 1
129129
end = max(0, self.index - (1 - add))
130-
for idx in xrange(end):
130+
for idx in range(end):
131131
val = self.entries_by_index[end - 1 - idx]
132132
if val.startswith(search_term):
133133
return idx + (0 if include_current else 1)
@@ -136,7 +136,7 @@ def find_match_forward(self, search_term, include_current=False):
136136
def find_partial_match_forward(self, search_term, include_current=False):
137137
add = 0 if include_current else 1
138138
end = max(0, self.index - (1 - add))
139-
for idx in xrange(end):
139+
for idx in range(end):
140140
val = self.entries_by_index[end - 1 - idx]
141141
if search_term in val:
142142
return idx + add

‎bpython/keys.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ def __setitem__(self, key, value):
6666
cli_key_dispatch['C-_'] = (chr(31), '^_')
6767

6868
# fill dispatch with function keys
69-
for x in xrange(1, 13):
69+
for x in range(1, 13):
7070
cli_key_dispatch['F%s' % str(x)] = ('KEY_F(%s)' % str(x),)
7171

72-
for x in xrange(1, 13):
72+
for x in range(1, 13):
7373
urwid_key_dispatch['F%s' % str(x)] = 'f%s' % str(x)

‎bpython/test/test_crashers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def run_bpython(self, input):
5353
result = Deferred()
5454

5555
class Protocol(ProcessProtocol):
56-
STATES = (SEND_INPUT, COLLECT) = xrange(2)
56+
STATES = (SEND_INPUT, COLLECT) = range(2)
5757

5858
def __init__(self):
5959
self.data = ""

‎bpython/test/test_manual_readline.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def test_left_arrow_at_zero(self):
2525
self.assertEquals(expected, result)
2626

2727
def test_left_arrow_at_non_zero(self):
28-
for i in xrange(1, len(self._line)):
28+
for i in range(1, len(self._line)):
2929
expected = (i-1, self._line)
3030
result = left_arrow(i, self._line)
3131
self.assertEqual(expected, result)
@@ -37,20 +37,20 @@ def test_right_arrow_at_end(self):
3737
self.assertEquals(expected, result)
3838

3939
def test_right_arrow_at_non_end(self):
40-
for i in xrange(len(self._line) - 1):
40+
for i in range(len(self._line) - 1):
4141
expected = (i + 1, self._line)
4242
result = right_arrow(i, self._line)
4343
self.assertEquals(expected, result)
4444

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

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

‎bpython/urwid.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,7 @@ def reevaluate(self):
893893
self.scr.refresh()
894894

895895
if self.buffer:
896-
for unused in xrange(indent):
896+
for unused in range(indent):
897897
self.tab()
898898

899899
self.evaluating = False

0 commit comments

Comments
 (0)