Skip to content

Commit

Permalink
all: remove list(range())
Browse files Browse the repository at this point in the history
  • Loading branch information
khancyr authored and tridge committed Oct 10, 2016
1 parent da3f515 commit 2dbf713
Show file tree
Hide file tree
Showing 26 changed files with 59 additions and 59 deletions.
4 changes: 2 additions & 2 deletions DFReader.py
Expand Up @@ -65,7 +65,7 @@ def __init__(self, type, name, flen, format, columns):
self.msg_types = msg_types
self.msg_mults = msg_mults
self.colhash = {}
for i in list(range(len(self.columns))):
for i in range(len(self.columns)):
self.colhash[self.columns[i]] = i

def __str__(self):
Expand Down Expand Up @@ -124,7 +124,7 @@ def __str__(self):
def get_msgbuf(self):
'''create a binary message buffer for a message'''
values = []
for i in list(range(len(self.fmt.columns))):
for i in range(len(self.fmt.columns)):
if i >= len(self.fmt.msg_mults):
continue
mul = self.fmt.msg_mults[i]
Expand Down
2 changes: 1 addition & 1 deletion examples/apmsetrate.py
Expand Up @@ -49,7 +49,7 @@ def show_messages(m):
wait_heartbeat(master)

print("Sending all stream request for rate %u" % args.rate)
for i in list(range(0, 3)):
for i in range(0, 3):
master.mav.request_data_stream_send(master.target_system, master.target_component,
mavutil.mavlink.MAV_DATA_STREAM_ALL, args.rate, 1)
if args.showmessages:
Expand Down
2 changes: 1 addition & 1 deletion examples/wptogpx.py
Expand Up @@ -50,7 +50,7 @@ def add_footer():
add_header()

count = 0
for i in list(range(wp.count())):
for i in range(wp.count()):
w = wp.wp(i)
if w.frame == 3:
w.z += wp.wp(0).z
Expand Down
2 changes: 1 addition & 1 deletion fgFDM.py
Expand Up @@ -209,7 +209,7 @@ def parse(self, buf):

def pack(self):
'''pack a FD FDM buffer from current values'''
for i in list(range(len(self.values))):
for i in range(len(self.values)):
if math.isnan(self.values[i]):
self.values[i] = 0
return struct.pack(self.pack_string, *self.values)
2 changes: 1 addition & 1 deletion generator/C/test/posix/sha256_test.py
Expand Up @@ -6,7 +6,7 @@
h = hashlib.new('sha256')
h.update(sys.argv[1])
res = h.digest()[:6]
for i in list(range(6)):
for i in range(6):
sys.stdout.write("%02x " % ord(res[i]))
sys.stdout.write("\n")

Expand Down
6 changes: 3 additions & 3 deletions generator/mavgen_c.py
Expand Up @@ -574,7 +574,7 @@ def generate_one(basename, xml):
# form message lengths array
xml.message_lengths_array = ''
if not xml.command_24bit:
for msgid in list(range(256)):
for msgid in range(256):
mlen = xml.message_min_lengths.get(msgid, 0)
xml.message_lengths_array += '%u, ' % mlen
xml.message_lengths_array = xml.message_lengths_array[:-2]
Expand All @@ -591,7 +591,7 @@ def generate_one(basename, xml):
xml.message_target_system_ofs[msgid],
xml.message_target_component_ofs[msgid])
else:
for msgid in list(range(256)):
for msgid in range(256):
crc = xml.message_crcs.get(msgid, 0)
xml.message_crcs_array += '%u, ' % crc
xml.message_crcs_array = xml.message_crcs_array[:-2]
Expand All @@ -604,7 +604,7 @@ def generate_one(basename, xml):
name = xml.message_names[msgid]
xml.message_info_array += 'MAVLINK_MESSAGE_INFO_%s, ' % name
else:
for msgid in list(range(256)):
for msgid in range(256):
name = xml.message_names.get(msgid, None)
if name is not None:
xml.message_info_array += 'MAVLINK_MESSAGE_INFO_%s, ' % name
Expand Down
4 changes: 2 additions & 2 deletions generator/mavgen_cs.py
Expand Up @@ -268,11 +268,11 @@ def generate(basename, xml):

for m in msgs:
m.order_map = [ 0 ] * len(m.fieldnames)
for i in list(range(0, len(m.fieldnames))):
for i in range(0, len(m.fieldnames)):
m.order_map[i] = m.ordered_fieldnames.index(m.fieldnames[i])

m.fields_in_order = []
for i in list(range(0, len(m.fieldnames))):
for i in range(0, len(m.fieldnames)):
m.order_map[i] = m.ordered_fieldnames.index(m.fieldnames[i])

print("Generating messages file: %s" % structsfilename)
Expand Down
2 changes: 1 addition & 1 deletion generator/mavgen_java.py
Expand Up @@ -45,7 +45,7 @@ def generate_enums(basename, xml):
def generate_CRC(directory, xml):
# and message CRCs array
xml.message_crcs_array = ''
for msgid in list(range(256)):
for msgid in range(256):
crc = xml.message_crcs.get(msgid, 0)
xml.message_crcs_array += '%u, ' % crc
xml.message_crcs_array = xml.message_crcs_array[:-2]
Expand Down
2 changes: 1 addition & 1 deletion generator/mavgen_javascript.py
Expand Up @@ -562,7 +562,7 @@ def generate(basename, xml):
for f in m.ordered_fields:
m.fmtstr += mavfmt(f)
m.order_map = [ 0 ] * len(m.fieldnames)
for i in list(range(0, len(m.fieldnames))):
for i in range(0, len(m.fieldnames)):
m.order_map[i] = m.ordered_fieldnames.index(m.fieldnames[i])

print("Generating %s" % filename)
Expand Down
12 changes: 6 additions & 6 deletions generator/mavgen_python.py
Expand Up @@ -313,7 +313,7 @@ def pack(self, mav, force_mavlink1=False):
return MAVLink_message.pack(self, mav, %u, struct.pack('%s'""" % (m.crc_extra, m.fmtstr))
for field in m.ordered_fields:
if (field.type != "char" and field.array_length > 1):
for i in list(range(field.array_length)):
for i in range(field.array_length):
outf.write(", self.{0:s}[{1:d}]".format(field.name,i))
else:
outf.write(", self.{0:s}".format(field.name))
Expand Down Expand Up @@ -728,12 +728,12 @@ def decode(self, msgbuf):
t = tlist[:]
if sum(len_map) == len(len_map):
# message has no arrays in it
for i in list(range(0, len(tlist))):
for i in range(0, len(tlist)):
tlist[i] = t[order_map[i]]
else:
# message has some arrays
tlist = []
for i in list(range(0, len(order_map))):
for i in range(0, len(order_map)):
order = order_map[i]
L = len_map[order]
tip = sum(len_map[:order])
Expand All @@ -744,7 +744,7 @@ def decode(self, msgbuf):
tlist.append(t[tip:(tip + L)])
# terminate any strings
for i in list(range(0, len(tlist))):
for i in range(0, len(tlist)):
if isinstance(tlist[i], str):
tlist[i] = str(MAVString(tlist[i]))
t = tuple(tlist)
Expand Down Expand Up @@ -836,10 +836,10 @@ def generate(basename, xml):
m.order_map = [ 0 ] * len(m.fieldnames)
m.len_map = [ 0 ] * len(m.fieldnames)
m.array_len_map = [ 0 ] * len(m.fieldnames)
for i in list(range(0, len(m.fieldnames))):
for i in range(0, len(m.fieldnames)):
m.order_map[i] = m.ordered_fieldnames.index(m.fieldnames[i])
m.array_len_map[i] = m.ordered_fields[i].array_length
for i in list(range(0, len(m.fieldnames))):
for i in range(0, len(m.fieldnames)):
n = m.order_map[i]
m.len_map[n] = m.fieldlengths[i]

Expand Down
6 changes: 3 additions & 3 deletions generator/mavgen_wlua.py
Expand Up @@ -128,7 +128,7 @@ def generate_msg_fields(outf, msg):
count = 1
ltype = 'string'

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

# handle arrays, but not strings

for i in list(range(0,count)):
for i in range(0,count):
if count>1:
index_text = '_' + str(i)
else:
Expand Down Expand Up @@ -324,7 +324,7 @@ def generate(basename, xml):
for f in m.ordered_fields:
m.fmtstr += mavfmt(f)
m.order_map = [ 0 ] * len(m.fieldnames)
for i in list(range(0, len(m.fieldnames))):
for i in range(0, len(m.fieldnames)):
m.order_map[i] = m.ordered_fieldnames.index(m.fieldnames[i])

print("Generating %s" % filename)
Expand Down
6 changes: 3 additions & 3 deletions generator/mavparse.py
Expand Up @@ -104,7 +104,7 @@ def set_test_value(self):
'''set a testsuite value for a MAVField'''
if self.array_length:
self.test_value = []
for i in list(range(self.array_length)):
for i in range(self.array_length):
self.test_value.append(self.gen_test_value(i))
else:
self.test_value = self.gen_test_value(0)
Expand Down Expand Up @@ -337,7 +337,7 @@ def char_data(data):
m.fieldlengths.append(1)
else:
m.fieldlengths.append(L)
for i in list(range(len(m.ordered_fields))):
for i in range(len(m.ordered_fields)):
f = m.ordered_fields[i]
f.wire_offset = m.wire_length
m.wire_length += f.wire_length
Expand Down Expand Up @@ -389,7 +389,7 @@ def message_checksum(msg):
# in order to allow for extensions the crc does not include
# any field extensions
crc_end = msg.base_fields()
for i in list(range(crc_end)):
for i in range(crc_end):
f = msg.ordered_fields[i]
crc.accumulate_str(f.type + ' ')
crc.accumulate_str(f.name + ' ')
Expand Down
4 changes: 2 additions & 2 deletions generator/mavtestgen.py
Expand Up @@ -71,7 +71,7 @@ def generate_outputs(mav):
for m in msgs:
if m.name == "HEARTBEAT": continue
outf.write("\tmav.%s_send(" % m.name.lower())
for i in list(range(0, len(m.fields))):
for i in range(0, len(m.fields)):
f = m.fields[i]
outf.write("%s=%s" % (f.name, gen_value(f, i, 'py')))
if i != len(m.fields)-1:
Expand All @@ -95,7 +95,7 @@ def generate_methods_C(outf, msgs):
for m in msgs:
if m.name == "HEARTBEAT": continue
outf.write("\tmavlink_msg_%s_send(chan," % m.name.lower())
for i in list(range(0, len(m.fields))):
for i in range(0, len(m.fields)):
f = m.fields[i]
outf.write("%s" % gen_value(f, i, 'C'))
if i != len(m.fields)-1:
Expand Down
6 changes: 3 additions & 3 deletions mavwp.py
Expand Up @@ -82,7 +82,7 @@ def insert(self, idx, w, comment=''):

def reindex(self):
'''reindex waypoints'''
for i in list(range(self.count())):
for i in range(self.count()):
w = self.wpoints[i]
w.seq = i
self.last_change = time.time()
Expand Down Expand Up @@ -414,7 +414,7 @@ def rally_point(self, i):

def reindex(self):
'''reset counters and indexes'''
for i in list(range(self.rally_count())):
for i in range(self.rally_count()):
self.rally_points[i].count = self.rally_count()
self.rally_points[i].idx = i
self.last_change = time.time()
Expand Down Expand Up @@ -524,7 +524,7 @@ def add(self, p):

def reindex(self):
'''reindex waypoints'''
for i in list(range(self.count())):
for i in range(self.count()):
w = self.points[i]
w.idx = i
w.count = self.count()
Expand Down
8 changes: 4 additions & 4 deletions rotmat.py
Expand Up @@ -365,9 +365,9 @@ def test_euler():
'''check that from_euler() and to_euler() are consistent'''
m = Matrix3()
from math import radians, degrees
for r in list(range(-179, 179, 3)):
for p in list(range(-89, 89, 3)):
for y in list(range(-179, 179, 3)):
for r in range(-179, 179, 3):
for p in range(-89, 89, 3):
for y in range(-179, 179, 3):
m.from_euler(radians(r), radians(p), radians(y))
(r2, p2, y2) = m.to_euler()
v1 = Vector3(r,p,y)
Expand All @@ -380,7 +380,7 @@ def test_euler():
def test_two_vectors():
'''test the from_two_vectors() method'''
import random
for i in list(range(1000)):
for i in range(1000):
v1 = Vector3(1, 0.2, -3)
v2 = Vector3(random.uniform(-5,5), random.uniform(-5,5), random.uniform(-5,5))
m = Matrix3()
Expand Down
2 changes: 1 addition & 1 deletion tools/AccelSearch.py
Expand Up @@ -112,7 +112,7 @@ def AccelSearch(filename):
elif d.endswith('.tlog'):
filelist.append(d)

for i in list(range(len(filelist))):
for i in range(len(filelist)):
f = filelist[i]
print("Checking %s ... [found=%u logcount=%u i=%u/%u]" % (f, len(found), logcount, i, len(filelist)))
if AccelSearch(f):
Expand Down
4 changes: 2 additions & 2 deletions tools/MPU6KSearch.py
Expand Up @@ -92,7 +92,7 @@ def IMUCheckFail(filename):
return False

if accel1 is not None and accel2 is not None and gotimu2 and t2 >= t1:
for i in list(range(3)):
for i in range(3):
adiff = accel1[i] - accel2[i]
if adiff > athreshold:
if ecount_accel[i] < 0:
Expand Down Expand Up @@ -158,7 +158,7 @@ def match_extension(f):
elif match_extension(d):
filelist.append(d)

for i in list(range(len(filelist))):
for i in range(len(filelist)):
f = filelist[i]
print("Checking %s ... [found=%u i=%u/%u]" % (f, len(found), i, len(filelist)))
try:
Expand Down
2 changes: 1 addition & 1 deletion tools/magfit.py
Expand Up @@ -132,7 +132,7 @@ def magfit(logfile):
# do an initial fit
(offsets, field_strength) = fit_data(data)

for count in list(range(3)):
for count in range(3):
# sort the data by the radius
data.sort(lambda a,b : radius_cmp(a,b,offsets))

Expand Down
4 changes: 2 additions & 2 deletions tools/magfit_delta.py
Expand Up @@ -62,7 +62,7 @@ def find_offsets(data, ofs):
history_idx = 0
mag_history = data[0:args.history]

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

Expand Down Expand Up @@ -128,7 +128,7 @@ def magfit(logfile):
# run the fitting algorithm
ofs = offsets
ofs = Vector3(0,0,0)
for r in list(range(args.repeat)):
for r in range(args.repeat):
ofs = find_offsets(data, ofs)
print('Loop %u offsets %s' % (r, ofs))
sys.stdout.flush()
Expand Down
2 changes: 1 addition & 1 deletion tools/magfit_motors.py
Expand Up @@ -125,7 +125,7 @@ def magfit(logfile):
# do an initial fit with all data
(offsets, motor_ofs, field_strength) = fit_data(data)

for count in list(range(3)):
for count in range(3):
# sort the data by the radius
data.sort(lambda a,b : radius_cmp(a,b,offsets,motor_ofs))

Expand Down
4 changes: 2 additions & 2 deletions tools/magfit_rotation_gps.py
Expand Up @@ -71,7 +71,7 @@ def heading_difference(mag, attitude, declination):
return abs(angle_diff(heading, heading2))

def add_errors(mag, attitude, total_error, rotations):
for i in list(range(len(rotations))):
for i in range(len(rotations)):
r = rotations[i].r
rmag = r * mag
total_error[i] += heading_difference(rmag, attitude, args.declination)
Expand Down Expand Up @@ -109,7 +109,7 @@ def magfit(logfile):

best_i = 0
best_err = total_error[0]
for i in list(range(len(rotations))):
for i in range(len(rotations)):
r = rotations[i]
print("(%u,%u,%u) err=%.2f" % (
r.roll,
Expand Down
4 changes: 2 additions & 2 deletions tools/magfit_rotation_gyro.py
Expand Up @@ -92,7 +92,7 @@ def mag_fixup(mag, AHRS_ORIENTATION, COMPASS_ORIENT, COMPASS_EXTERNAL):
return mag

def add_errors(mag, gyr, last_mag, deltat, total_error, rotations):
for i in list(range(len(rotations))):
for i in range(len(rotations)):
if not rotations[i].is_90_degrees():
continue
r = rotations[i].r
Expand Down Expand Up @@ -160,7 +160,7 @@ def magfit(logfile):

best_i = 0
best_err = total_error[0]
for i in list(range(len(rotations))):
for i in range(len(rotations)):
r = rotations[i]
if not r.is_90_degrees():
continue
Expand Down

0 comments on commit 2dbf713

Please sign in to comment.