Skip to content

Commit 6a23a29

Browse files
committed
use python-style loops in pyx files in misc
1 parent 665a3fa commit 6a23a29

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

src/sage/misc/c3.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,11 @@ cpdef list C3_algorithm(object start, str bases, str attribute, bint proper):
203203
cdef list tail_list
204204

205205
while nbheads:
206-
for i from 0 <= i < nbheads:
206+
for i in range(nbheads):
207207
O = heads[i]
208208
# Does O appear in none of the tails? ``all(O not in tail for tail in tailsets)``
209209
next_item_found = True
210-
for j from 0 <= j < nbheads:
210+
for j in range(nbheads):
211211
if j == i:
212212
continue
213213
if <size_t><void *>O in <set>tailsets[j]:
@@ -218,7 +218,7 @@ cpdef list C3_algorithm(object start, str bases, str attribute, bint proper):
218218
# Clear O from other heads, removing the line altogether
219219
# if the tail is already empty.
220220
# j goes down so that ``del heads[j]`` does not screw up the numbering
221-
for j from nbheads > j >= 0:
221+
for j in range(nbheads - 1, -1, -1):
222222
if heads[j] is O:
223223
tail_list = tails[j]
224224
if tail_list:

src/sage/misc/c3_controlled.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ cpdef tuple C3_sorted_merge(list lists, key=identity):
883883
break
884884
if cont:
885885
continue
886-
for j from i<j<nbheads:
886+
for j in range(i + 1, nbheads):
887887
if O_key in tailsets[j]:
888888
cont = True
889889
break

src/sage/misc/derivative.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def derivative_parse(args):
163163
raise ValueError("derivative counts must be nonnegative")
164164
if not got_var:
165165
var = None
166-
for i from 0 <= i < count:
166+
for i in range(count):
167167
output.append(var)
168168
got_var = 0
169169
else:

src/sage/misc/function_mangling.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ cdef class ArgumentFixer:
211211
cdef dict defaults = self._defaults
212212
cdef int i
213213
cdef dict kwargs_ = dict(kwargs)
214-
for i from 0<=i<self._nargs:
214+
for i in range(self._nargs):
215215
name = arg_names[i]
216216
if i >= lenargs:
217217
if name in kwargs_:

src/sage/misc/misc_c.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ cdef balanced_list_prod(L, Py_ssize_t offset, Py_ssize_t count, Py_ssize_t cutof
176176
cdef Py_ssize_t k
177177
if count <= cutoff:
178178
prod = <object>PySequence_Fast_GET_ITEM(L, offset)
179-
for k from offset < k < offset + count:
179+
for k in range(offset + 1, offset + count):
180180
prod *= <object>PySequence_Fast_GET_ITEM(L, k)
181181
return prod
182182
else:
@@ -242,7 +242,7 @@ cpdef iterator_prod(L, z=None, bint multiply=True):
242242
x = sub_prods[tip] * x
243243
else:
244244
x = sub_prods[tip] + x
245-
for j from 1 <= j < 64:
245+
for j in range(1, 64):
246246
if i & (1 << j):
247247
break
248248
tip -= 1

src/sage/misc/randstate.pyx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,9 +1036,8 @@ def benchmark_mt():
10361036
sage: timeit('benchmark_mt()') # random
10371037
125 loops, best of 3: 2.11 ms per loop
10381038
"""
1039-
cdef int i
10401039
cdef randstate rstate = _current_randstate
1041-
for i from 0 <= i < 100000:
1040+
for _ in range(100000):
10421041
gmp_urandomb_ui(rstate.gmp_state, 32)
10431042

10441043

0 commit comments

Comments
 (0)