Skip to content

Commit c6eff7b

Browse files
drowe67drowe67
authored
Merge pull request drowe67#254 from drowe67/ms-python3
Force use of Python 3 for all scripts.
2 parents cb1eab5 + c24198a commit c6eff7b

File tree

12 files changed

+72
-72
lines changed

12 files changed

+72
-72
lines changed

‎octave/fsk_demod_BER_test.py‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
#
33
# Perform automated Eb/N0 testing of the C-implementation of fsk_mod / fsk_demod
44
#

‎octave/fskdemodgui.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
#
33
# fsk_demod Statistics GUI
44
# Accepts the stats output from fsk_demod on stdin, and plots it.

‎octave/plot_fsk_demod_stats.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
#
33
# Plot fsk_demod statistic outputs.
44
#

‎stm32/support/hex2dfu.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python2
1+
#!/usr/bin/env python3
22
#
33
# Intel HEX to ST microelectronics DfuSe file converter
44
# Copyright (C)2015 Thomas Kindler <mail@t-kindler.de>
@@ -21,15 +21,15 @@
2121
import argparse
2222
from zlib import crc32
2323
from intelhex import IntelHex
24-
24+
from numpy.compat.py3k import asbytes
2525

2626
def load_hex():
2727
"""
2828
Load hex or binary file.
2929
:return: intelhex object
3030
"""
3131
if args.verbose:
32-
print "Loading %s..." % args.source
32+
print("Loading %s..." % args.source)
3333

3434
try:
3535
ih = IntelHex()
@@ -39,13 +39,13 @@ def load_hex():
3939
else:
4040
ih.loadbin(args.source, args.start_addr)
4141

42-
except Exception, e:
43-
print e
42+
except Exception as e:
43+
print(e)
4444
exit(1)
4545

4646
if args.verbose:
47-
print " Start: 0x%08x" % ih.minaddr()
48-
print " End : 0x%08x" % ih.maxaddr()
47+
print(" Start: 0x%08x" % ih.minaddr())
48+
print(" End : 0x%08x" % ih.maxaddr())
4949

5050
return ih
5151

@@ -58,18 +58,18 @@ def save_dfu(ih):
5858
:param ih: intelhex object
5959
"""
6060
if args.verbose:
61-
print "Saving %s..." % args.target
62-
print " Device ID: 0x%04x:0x%04x" % (args.vid, args.pid)
63-
print " Target name: %s" % args.target_name
61+
print("Saving %s..." % args.target)
62+
print(" Device ID: 0x%04x:0x%04x" % (args.vid, args.pid))
63+
print(" Target name: %s" % args.target_name)
6464

6565
# Image element
6666
#
67-
image_data = ih.tobinstr()
67+
image_data = asbytes(ih.tobinstr())
6868

6969
data = struct.pack(
7070
"<II",
7171
ih.minaddr(), # dwElementAddress
72-
len(image_data) # dwElementSize
72+
len(image_data), # dwElementSize
7373
) + image_data # Data
7474

7575
# Target prefix
@@ -118,8 +118,8 @@ def save_dfu(ih):
118118
try:
119119
open(args.target, "wb").write(data)
120120

121-
except Exception, e:
122-
print e
121+
except Exception as e:
122+
print(e)
123123
exit(1)
124124

125125

@@ -187,13 +187,13 @@ def save_dfu(ih):
187187

188188
if args.format == "bin":
189189
if args.start_addr == None:
190-
print "option --start required for binary files"
190+
print("option --start required for binary files")
191191
exit(1)
192192

193193
args.start_addr = int(args.start_addr, 0)
194194
else:
195195
if args.start_addr != None:
196-
print "option --start not allowed for hex files"
196+
print("option --start not allowed for hex files")
197197
exit(1)
198198

199199

‎stm32/support/intelhex/__init__.py‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import os
4848
import sys
4949

50-
from compat import asbytes, asstr
50+
from numpy.compat.py3k import asbytes, asstr
5151

5252

5353
class _DeprecatedParam(object):
@@ -132,7 +132,7 @@ def _decode_record(self, s, line=0):
132132
if record_type == 0:
133133
# data record
134134
addr += self._offset
135-
for i in xrange(4, 4+record_length):
135+
for i in range(4, 4+record_length):
136136
if not self._buf.get(addr, None) is None:
137137
raise AddressOverlapError(address=addr, line=line)
138138
self._buf[addr] = bin[i]
@@ -319,12 +319,12 @@ def tobinarray(self, start=None, end=None, pad=_DEPRECATED, size=None):
319319
@return array of unsigned char data.
320320
'''
321321
if not isinstance(pad, _DeprecatedParam):
322-
print "IntelHex.tobinarray: 'pad' parameter is deprecated."
322+
print("IntelHex.tobinarray: 'pad' parameter is deprecated.")
323323
if pad is not None:
324-
print "Please, use IntelHex.padding attribute instead."
324+
print("Please, use IntelHex.padding attribute instead.")
325325
else:
326-
print "Please, don't pass it explicitly."
327-
print "Use syntax like this: ih.tobinarray(start=xxx, end=yyy, size=zzz)"
326+
print("Please, don't pass it explicitly.")
327+
print("Use syntax like this: ih.tobinarray(start=xxx, end=yyy, size=zzz)")
328328
else:
329329
pad = None
330330
return self._tobinarray_really(start, end, pad, size)
@@ -343,7 +343,7 @@ def _tobinarray_really(self, start, end, pad, size):
343343

344344
start, end = self._get_start_end(start, end, size)
345345

346-
for i in xrange(start, end+1):
346+
for i in range(start, end+1):
347347
bin.append(self._buf.get(i, pad))
348348

349349
return bin
@@ -359,12 +359,12 @@ def tobinstr(self, start=None, end=None, pad=_DEPRECATED, size=None):
359359
@return string of binary data.
360360
'''
361361
if not isinstance(pad, _DeprecatedParam):
362-
print "IntelHex.tobinstr: 'pad' parameter is deprecated."
362+
print("IntelHex.tobinstr: 'pad' parameter is deprecated.")
363363
if pad is not None:
364-
print "Please, use IntelHex.padding attribute instead."
364+
print("Please, use IntelHex.padding attribute instead.")
365365
else:
366-
print "Please, don't pass it explicitly."
367-
print "Use syntax like this: ih.tobinstr(start=xxx, end=yyy, size=zzz)"
366+
print("Please, don't pass it explicitly.")
367+
print("Use syntax like this: ih.tobinstr(start=xxx, end=yyy, size=zzz)")
368368
else:
369369
pad = None
370370
return self._tobinstr_really(start, end, pad, size)
@@ -384,12 +384,12 @@ def tobinfile(self, fobj, start=None, end=None, pad=_DEPRECATED, size=None):
384384
@param size size of the block, used with start or end parameter.
385385
'''
386386
if not isinstance(pad, _DeprecatedParam):
387-
print "IntelHex.tobinfile: 'pad' parameter is deprecated."
387+
print("IntelHex.tobinfile: 'pad' parameter is deprecated.")
388388
if pad is not None:
389-
print "Please, use IntelHex.padding attribute instead."
389+
print("Please, use IntelHex.padding attribute instead.")
390390
else:
391-
print "Please, don't pass it explicitly."
392-
print "Use syntax like this: ih.tobinfile(start=xxx, end=yyy, size=zzz)"
391+
print("Please, don't pass it explicitly.")
392+
print("Use syntax like this: ih.tobinfile(start=xxx, end=yyy, size=zzz)")
393393
else:
394394
pad = None
395395
if getattr(fobj, "write", None) is None:
@@ -461,7 +461,7 @@ def __getitem__(self, addr):
461461
start = addr.start or addresses[0]
462462
stop = addr.stop or (addresses[-1]+1)
463463
step = addr.step or 1
464-
for i in xrange(start, stop, step):
464+
for i in range(start, stop, step):
465465
x = self._buf.get(i)
466466
if x is not None:
467467
ih[i] = x
@@ -498,7 +498,7 @@ def __setitem__(self, addr, byte):
498498
if stop < 0:
499499
raise TypeError('stop address cannot be negative')
500500
j = 0
501-
for i in xrange(start, stop, step):
501+
for i in range(start, stop, step):
502502
self._buf[i] = byte[j]
503503
j += 1
504504
else:
@@ -518,7 +518,7 @@ def __delitem__(self, addr):
518518
start = addr.start or addresses[0]
519519
stop = addr.stop or (addresses[-1]+1)
520520
step = addr.step or 1
521-
for i in xrange(start, stop, step):
521+
for i in range(start, stop, step):
522522
x = self._buf.get(i)
523523
if x is not None:
524524
del self._buf[i]
@@ -706,7 +706,7 @@ def gets(self, addr, length):
706706
be raised. Padding is not used."""
707707
a = array('B', asbytes('\0'*length))
708708
try:
709-
for i in xrange(length):
709+
for i in range(length):
710710
a[i] = self._buf[addr+i]
711711
except KeyError:
712712
raise NotEnoughDataError(address=addr, length=length)
@@ -717,7 +717,7 @@ def puts(self, addr, s):
717717
entries.
718718
"""
719719
a = array('B', asbytes(s))
720-
for i in xrange(len(a)):
720+
for i in range(len(a)):
721721
self._buf[addr+i] = a[i]
722722

723723
def getsz(self, addr):
@@ -772,7 +772,7 @@ def dump(self, tofile=None):
772772
maxdigits = max(len(str(endaddr)), 4)
773773
templa = '%%0%dX' % maxdigits
774774
range16 = range(16)
775-
for i in xrange(startaddr, endaddr, 16):
775+
for i in range(startaddr, endaddr, 16):
776776
tofile.write(templa % i)
777777
tofile.write(' ')
778778
s = []
@@ -941,7 +941,7 @@ def tobinarray(self, start=None, end=None, size=None):
941941

942942
start, end = self._get_start_end(start, end, size)
943943

944-
for addr in xrange(start, end+1):
944+
for addr in range(start, end+1):
945945
bin.append(self[addr])
946946

947947
return bin
@@ -963,7 +963,7 @@ def hex2bin(fin, fout, start=None, end=None, size=None, pad=None):
963963
"""
964964
try:
965965
h = IntelHex(fin)
966-
except HexReaderError, e:
966+
except HexReaderError as e:
967967
txt = "ERROR: bad HEX file: %s" % str(e)
968968
print(txt)
969969
return 1
@@ -985,7 +985,7 @@ def hex2bin(fin, fout, start=None, end=None, size=None, pad=None):
985985
# using .padding attribute rather than pad argument to function call
986986
h.padding = pad
987987
h.tobinfile(fout, start, end)
988-
except IOError, e:
988+
except IOError as e:
989989
txt = "ERROR: Could not write to file: %s: %s" % (fout, str(e))
990990
print(txt)
991991
return 1
@@ -1005,14 +1005,14 @@ def bin2hex(fin, fout, offset=0):
10051005
h = IntelHex()
10061006
try:
10071007
h.loadbin(fin, offset)
1008-
except IOError, e:
1008+
except IOError as e:
10091009
txt = 'ERROR: unable to load bin file:', str(e)
10101010
print(txt)
10111011
return 1
10121012

10131013
try:
10141014
h.tofile(fout, format='hex')
1015-
except IOError, e:
1015+
except IOError as e:
10161016
txt = "ERROR: Could not write to file: %s: %s" % (fout, str(e))
10171017
print(txt)
10181018
return 1
@@ -1215,7 +1215,7 @@ def __str__(self):
12151215
return self.msg
12161216
try:
12171217
return self._fmt % self.__dict__
1218-
except (NameError, ValueError, KeyError), e:
1218+
except (NameError, ValueError, KeyError) as e:
12191219
return 'Unprintable exception %s: %s' \
12201220
% (repr(e), str(e))
12211221

‎stm32/support/intelhex/bench.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python
1+
#!/usr/bin/python3
22
# (c) Alexander Belchenko, 2007, 2009
33

44
"""Benchmarking.
@@ -64,7 +64,7 @@ def run_readtest_N_times(func, hexstr, n):
6464
"""
6565
assert n > 0
6666
times = []
67-
for i in xrange(n):
67+
for i in range(n):
6868
sio = StringIO(hexstr)
6969
times.append(run_test(func, sio))
7070
sio.close()
@@ -79,7 +79,7 @@ def run_writetest_N_times(func, n):
7979
"""
8080
assert n > 0
8181
times = []
82-
for i in xrange(n):
82+
for i in range(n):
8383
sio = StringIO()
8484
times.append(run_test(func, sio))
8585
sio.close()
@@ -111,11 +111,11 @@ def get_test_data(n1, offset, n2):
111111
# make IntelHex object
112112
ih = intelhex.IntelHex()
113113
addr = 0
114-
for i in xrange(n1):
114+
for i in range(n1):
115115
ih[addr] = addr % 256
116116
addr += 1
117117
addr += offset
118-
for i in xrange(n2):
118+
for i in range(n2):
119119
ih[addr] = addr % 256
120120
addr += 1
121121
# make hex file
@@ -258,7 +258,7 @@ def main(argv=None):
258258

259259
if args:
260260
raise getopt.GetoptError('Arguments are not used.')
261-
except getopt.GetoptError, msg:
261+
except getopt.GetoptError as msg:
262262
txt = str(msg)
263263
print(txt)
264264
return 1

0 commit comments

Comments
 (0)