Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 2dbf713

Browse files
khancyrtridge
authored andcommittedOct 10, 2016
all: remove list(range())
1 parent da3f515 commit 2dbf713

26 files changed

+59
-59
lines changed
 

‎DFReader.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def __init__(self, type, name, flen, format, columns):
6565
self.msg_types = msg_types
6666
self.msg_mults = msg_mults
6767
self.colhash = {}
68-
for i in list(range(len(self.columns))):
68+
for i in range(len(self.columns)):
6969
self.colhash[self.columns[i]] = i
7070

7171
def __str__(self):
@@ -124,7 +124,7 @@ def __str__(self):
124124
def get_msgbuf(self):
125125
'''create a binary message buffer for a message'''
126126
values = []
127-
for i in list(range(len(self.fmt.columns))):
127+
for i in range(len(self.fmt.columns)):
128128
if i >= len(self.fmt.msg_mults):
129129
continue
130130
mul = self.fmt.msg_mults[i]

‎examples/apmsetrate.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def show_messages(m):
4949
wait_heartbeat(master)
5050

5151
print("Sending all stream request for rate %u" % args.rate)
52-
for i in list(range(0, 3)):
52+
for i in range(0, 3):
5353
master.mav.request_data_stream_send(master.target_system, master.target_component,
5454
mavutil.mavlink.MAV_DATA_STREAM_ALL, args.rate, 1)
5555
if args.showmessages:

‎examples/wptogpx.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def add_footer():
5050
add_header()
5151

5252
count = 0
53-
for i in list(range(wp.count())):
53+
for i in range(wp.count()):
5454
w = wp.wp(i)
5555
if w.frame == 3:
5656
w.z += wp.wp(0).z

‎fgFDM.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def parse(self, buf):
209209

210210
def pack(self):
211211
'''pack a FD FDM buffer from current values'''
212-
for i in list(range(len(self.values))):
212+
for i in range(len(self.values)):
213213
if math.isnan(self.values[i]):
214214
self.values[i] = 0
215215
return struct.pack(self.pack_string, *self.values)

‎generator/C/test/posix/sha256_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
h = hashlib.new('sha256')
77
h.update(sys.argv[1])
88
res = h.digest()[:6]
9-
for i in list(range(6)):
9+
for i in range(6):
1010
sys.stdout.write("%02x " % ord(res[i]))
1111
sys.stdout.write("\n")
1212

‎generator/mavgen_c.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ def generate_one(basename, xml):
574574
# form message lengths array
575575
xml.message_lengths_array = ''
576576
if not xml.command_24bit:
577-
for msgid in list(range(256)):
577+
for msgid in range(256):
578578
mlen = xml.message_min_lengths.get(msgid, 0)
579579
xml.message_lengths_array += '%u, ' % mlen
580580
xml.message_lengths_array = xml.message_lengths_array[:-2]
@@ -591,7 +591,7 @@ def generate_one(basename, xml):
591591
xml.message_target_system_ofs[msgid],
592592
xml.message_target_component_ofs[msgid])
593593
else:
594-
for msgid in list(range(256)):
594+
for msgid in range(256):
595595
crc = xml.message_crcs.get(msgid, 0)
596596
xml.message_crcs_array += '%u, ' % crc
597597
xml.message_crcs_array = xml.message_crcs_array[:-2]
@@ -604,7 +604,7 @@ def generate_one(basename, xml):
604604
name = xml.message_names[msgid]
605605
xml.message_info_array += 'MAVLINK_MESSAGE_INFO_%s, ' % name
606606
else:
607-
for msgid in list(range(256)):
607+
for msgid in range(256):
608608
name = xml.message_names.get(msgid, None)
609609
if name is not None:
610610
xml.message_info_array += 'MAVLINK_MESSAGE_INFO_%s, ' % name

‎generator/mavgen_cs.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,11 @@ def generate(basename, xml):
268268

269269
for m in msgs:
270270
m.order_map = [ 0 ] * len(m.fieldnames)
271-
for i in list(range(0, len(m.fieldnames))):
271+
for i in range(0, len(m.fieldnames)):
272272
m.order_map[i] = m.ordered_fieldnames.index(m.fieldnames[i])
273273

274274
m.fields_in_order = []
275-
for i in list(range(0, len(m.fieldnames))):
275+
for i in range(0, len(m.fieldnames)):
276276
m.order_map[i] = m.ordered_fieldnames.index(m.fieldnames[i])
277277

278278
print("Generating messages file: %s" % structsfilename)

‎generator/mavgen_java.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def generate_enums(basename, xml):
4545
def generate_CRC(directory, xml):
4646
# and message CRCs array
4747
xml.message_crcs_array = ''
48-
for msgid in list(range(256)):
48+
for msgid in range(256):
4949
crc = xml.message_crcs.get(msgid, 0)
5050
xml.message_crcs_array += '%u, ' % crc
5151
xml.message_crcs_array = xml.message_crcs_array[:-2]

‎generator/mavgen_javascript.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ def generate(basename, xml):
562562
for f in m.ordered_fields:
563563
m.fmtstr += mavfmt(f)
564564
m.order_map = [ 0 ] * len(m.fieldnames)
565-
for i in list(range(0, len(m.fieldnames))):
565+
for i in range(0, len(m.fieldnames)):
566566
m.order_map[i] = m.ordered_fieldnames.index(m.fieldnames[i])
567567

568568
print("Generating %s" % filename)

‎generator/mavgen_python.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ def pack(self, mav, force_mavlink1=False):
313313
return MAVLink_message.pack(self, mav, %u, struct.pack('%s'""" % (m.crc_extra, m.fmtstr))
314314
for field in m.ordered_fields:
315315
if (field.type != "char" and field.array_length > 1):
316-
for i in list(range(field.array_length)):
316+
for i in range(field.array_length):
317317
outf.write(", self.{0:s}[{1:d}]".format(field.name,i))
318318
else:
319319
outf.write(", self.{0:s}".format(field.name))
@@ -728,12 +728,12 @@ def decode(self, msgbuf):
728728
t = tlist[:]
729729
if sum(len_map) == len(len_map):
730730
# message has no arrays in it
731-
for i in list(range(0, len(tlist))):
731+
for i in range(0, len(tlist)):
732732
tlist[i] = t[order_map[i]]
733733
else:
734734
# message has some arrays
735735
tlist = []
736-
for i in list(range(0, len(order_map))):
736+
for i in range(0, len(order_map)):
737737
order = order_map[i]
738738
L = len_map[order]
739739
tip = sum(len_map[:order])
@@ -744,7 +744,7 @@ def decode(self, msgbuf):
744744
tlist.append(t[tip:(tip + L)])
745745
746746
# terminate any strings
747-
for i in list(range(0, len(tlist))):
747+
for i in range(0, len(tlist)):
748748
if isinstance(tlist[i], str):
749749
tlist[i] = str(MAVString(tlist[i]))
750750
t = tuple(tlist)
@@ -836,10 +836,10 @@ def generate(basename, xml):
836836
m.order_map = [ 0 ] * len(m.fieldnames)
837837
m.len_map = [ 0 ] * len(m.fieldnames)
838838
m.array_len_map = [ 0 ] * len(m.fieldnames)
839-
for i in list(range(0, len(m.fieldnames))):
839+
for i in range(0, len(m.fieldnames)):
840840
m.order_map[i] = m.ordered_fieldnames.index(m.fieldnames[i])
841841
m.array_len_map[i] = m.ordered_fields[i].array_length
842-
for i in list(range(0, len(m.fieldnames))):
842+
for i in range(0, len(m.fieldnames)):
843843
n = m.order_map[i]
844844
m.len_map[n] = m.fieldlengths[i]
845845

‎generator/mavgen_wlua.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def generate_msg_fields(outf, msg):
128128
count = 1
129129
ltype = 'string'
130130

131-
for i in list(range(0,count)):
131+
for i in range(0,count):
132132
if count>1:
133133
array_text = '[' + str(i) + ']'
134134
index_text = '_' + str(i)
@@ -158,7 +158,7 @@ def generate_field_dissector(outf, msg, field):
158158

159159
# handle arrays, but not strings
160160

161-
for i in list(range(0,count)):
161+
for i in range(0,count):
162162
if count>1:
163163
index_text = '_' + str(i)
164164
else:
@@ -324,7 +324,7 @@ def generate(basename, xml):
324324
for f in m.ordered_fields:
325325
m.fmtstr += mavfmt(f)
326326
m.order_map = [ 0 ] * len(m.fieldnames)
327-
for i in list(range(0, len(m.fieldnames))):
327+
for i in range(0, len(m.fieldnames)):
328328
m.order_map[i] = m.ordered_fieldnames.index(m.fieldnames[i])
329329

330330
print("Generating %s" % filename)

‎generator/mavparse.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def set_test_value(self):
104104
'''set a testsuite value for a MAVField'''
105105
if self.array_length:
106106
self.test_value = []
107-
for i in list(range(self.array_length)):
107+
for i in range(self.array_length):
108108
self.test_value.append(self.gen_test_value(i))
109109
else:
110110
self.test_value = self.gen_test_value(0)
@@ -337,7 +337,7 @@ def char_data(data):
337337
m.fieldlengths.append(1)
338338
else:
339339
m.fieldlengths.append(L)
340-
for i in list(range(len(m.ordered_fields))):
340+
for i in range(len(m.ordered_fields)):
341341
f = m.ordered_fields[i]
342342
f.wire_offset = m.wire_length
343343
m.wire_length += f.wire_length
@@ -389,7 +389,7 @@ def message_checksum(msg):
389389
# in order to allow for extensions the crc does not include
390390
# any field extensions
391391
crc_end = msg.base_fields()
392-
for i in list(range(crc_end)):
392+
for i in range(crc_end):
393393
f = msg.ordered_fields[i]
394394
crc.accumulate_str(f.type + ' ')
395395
crc.accumulate_str(f.name + ' ')

‎generator/mavtestgen.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def generate_outputs(mav):
7171
for m in msgs:
7272
if m.name == "HEARTBEAT": continue
7373
outf.write("\tmav.%s_send(" % m.name.lower())
74-
for i in list(range(0, len(m.fields))):
74+
for i in range(0, len(m.fields)):
7575
f = m.fields[i]
7676
outf.write("%s=%s" % (f.name, gen_value(f, i, 'py')))
7777
if i != len(m.fields)-1:
@@ -95,7 +95,7 @@ def generate_methods_C(outf, msgs):
9595
for m in msgs:
9696
if m.name == "HEARTBEAT": continue
9797
outf.write("\tmavlink_msg_%s_send(chan," % m.name.lower())
98-
for i in list(range(0, len(m.fields))):
98+
for i in range(0, len(m.fields)):
9999
f = m.fields[i]
100100
outf.write("%s" % gen_value(f, i, 'C'))
101101
if i != len(m.fields)-1:

‎mavwp.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def insert(self, idx, w, comment=''):
8282

8383
def reindex(self):
8484
'''reindex waypoints'''
85-
for i in list(range(self.count())):
85+
for i in range(self.count()):
8686
w = self.wpoints[i]
8787
w.seq = i
8888
self.last_change = time.time()
@@ -414,7 +414,7 @@ def rally_point(self, i):
414414

415415
def reindex(self):
416416
'''reset counters and indexes'''
417-
for i in list(range(self.rally_count())):
417+
for i in range(self.rally_count()):
418418
self.rally_points[i].count = self.rally_count()
419419
self.rally_points[i].idx = i
420420
self.last_change = time.time()
@@ -524,7 +524,7 @@ def add(self, p):
524524

525525
def reindex(self):
526526
'''reindex waypoints'''
527-
for i in list(range(self.count())):
527+
for i in range(self.count()):
528528
w = self.points[i]
529529
w.idx = i
530530
w.count = self.count()

‎rotmat.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,9 @@ def test_euler():
365365
'''check that from_euler() and to_euler() are consistent'''
366366
m = Matrix3()
367367
from math import radians, degrees
368-
for r in list(range(-179, 179, 3)):
369-
for p in list(range(-89, 89, 3)):
370-
for y in list(range(-179, 179, 3)):
368+
for r in range(-179, 179, 3):
369+
for p in range(-89, 89, 3):
370+
for y in range(-179, 179, 3):
371371
m.from_euler(radians(r), radians(p), radians(y))
372372
(r2, p2, y2) = m.to_euler()
373373
v1 = Vector3(r,p,y)
@@ -380,7 +380,7 @@ def test_euler():
380380
def test_two_vectors():
381381
'''test the from_two_vectors() method'''
382382
import random
383-
for i in list(range(1000)):
383+
for i in range(1000):
384384
v1 = Vector3(1, 0.2, -3)
385385
v2 = Vector3(random.uniform(-5,5), random.uniform(-5,5), random.uniform(-5,5))
386386
m = Matrix3()

‎tools/AccelSearch.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def AccelSearch(filename):
112112
elif d.endswith('.tlog'):
113113
filelist.append(d)
114114

115-
for i in list(range(len(filelist))):
115+
for i in range(len(filelist)):
116116
f = filelist[i]
117117
print("Checking %s ... [found=%u logcount=%u i=%u/%u]" % (f, len(found), logcount, i, len(filelist)))
118118
if AccelSearch(f):

‎tools/MPU6KSearch.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def IMUCheckFail(filename):
9292
return False
9393

9494
if accel1 is not None and accel2 is not None and gotimu2 and t2 >= t1:
95-
for i in list(range(3)):
95+
for i in range(3):
9696
adiff = accel1[i] - accel2[i]
9797
if adiff > athreshold:
9898
if ecount_accel[i] < 0:
@@ -158,7 +158,7 @@ def match_extension(f):
158158
elif match_extension(d):
159159
filelist.append(d)
160160

161-
for i in list(range(len(filelist))):
161+
for i in range(len(filelist)):
162162
f = filelist[i]
163163
print("Checking %s ... [found=%u i=%u/%u]" % (f, len(found), i, len(filelist)))
164164
try:

‎tools/magfit.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def magfit(logfile):
132132
# do an initial fit
133133
(offsets, field_strength) = fit_data(data)
134134

135-
for count in list(range(3)):
135+
for count in range(3):
136136
# sort the data by the radius
137137
data.sort(lambda a,b : radius_cmp(a,b,offsets))
138138

‎tools/magfit_delta.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def find_offsets(data, ofs):
6262
history_idx = 0
6363
mag_history = data[0:args.history]
6464

65-
for i in list(range(args.history, len(data))):
65+
for i in range(args.history, len(data)):
6666
B1 = mag_history[history_idx] + ofs
6767
B2 = data[i] + ofs
6868

@@ -128,7 +128,7 @@ def magfit(logfile):
128128
# run the fitting algorithm
129129
ofs = offsets
130130
ofs = Vector3(0,0,0)
131-
for r in list(range(args.repeat)):
131+
for r in range(args.repeat):
132132
ofs = find_offsets(data, ofs)
133133
print('Loop %u offsets %s' % (r, ofs))
134134
sys.stdout.flush()

‎tools/magfit_motors.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def magfit(logfile):
125125
# do an initial fit with all data
126126
(offsets, motor_ofs, field_strength) = fit_data(data)
127127

128-
for count in list(range(3)):
128+
for count in range(3):
129129
# sort the data by the radius
130130
data.sort(lambda a,b : radius_cmp(a,b,offsets,motor_ofs))
131131

‎tools/magfit_rotation_gps.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def heading_difference(mag, attitude, declination):
7171
return abs(angle_diff(heading, heading2))
7272

7373
def add_errors(mag, attitude, total_error, rotations):
74-
for i in list(range(len(rotations))):
74+
for i in range(len(rotations)):
7575
r = rotations[i].r
7676
rmag = r * mag
7777
total_error[i] += heading_difference(rmag, attitude, args.declination)
@@ -109,7 +109,7 @@ def magfit(logfile):
109109

110110
best_i = 0
111111
best_err = total_error[0]
112-
for i in list(range(len(rotations))):
112+
for i in range(len(rotations)):
113113
r = rotations[i]
114114
print("(%u,%u,%u) err=%.2f" % (
115115
r.roll,

‎tools/magfit_rotation_gyro.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def mag_fixup(mag, AHRS_ORIENTATION, COMPASS_ORIENT, COMPASS_EXTERNAL):
9292
return mag
9393

9494
def add_errors(mag, gyr, last_mag, deltat, total_error, rotations):
95-
for i in list(range(len(rotations))):
95+
for i in range(len(rotations)):
9696
if not rotations[i].is_90_degrees():
9797
continue
9898
r = rotations[i].r
@@ -160,7 +160,7 @@ def magfit(logfile):
160160

161161
best_i = 0
162162
best_err = total_error[0]
163-
for i in list(range(len(rotations))):
163+
for i in range(len(rotations)):
164164
r = rotations[i]
165165
if not r.is_90_degrees():
166166
continue
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.