Switch to python3, improve Makefile dependencies

Author: larsimmisch-adobe

Diff for: Makefile

@@ -65,14 +65,18 @@ all: $(BIN) $(BIN:.bin=.lst) sizes/sizes.html
 .bin_upload:
 	avrdude -F -V -p $(MCU_TARGET) -P $(AVR_TTY) -c $(AVR_PROGRAMMER) -b $(AVR_RATE) -U flash:w:$<
 
+test/test_ws2811.cc: test/test.grb test/test.rgb
+
+test/test_ws2811_bridge.cc: test/test.grb test/test.rgb
+
 test/test.grb: test/make_grb.py
-	python test/make_grb.py > test/test.grb
+	python3 test/make_grb.py > test/test.grb
 
 test/test.rgb: test/make_rgb.py
-	python test/make_rgb.py > test/test.rgb
+	python3 test/make_rgb.py > test/test.rgb
 
 sizes/recent_sizes.json sizes/sizes.html: $(BIN)
-	python sizes/sizes.py recent generate
+	python3 sizes/sizes.py recent generate
 
 .PHONY: history
 history:
@@ -83,6 +87,6 @@ sizeclean:
 
 clean: sizeclean
 	rm -f *.o *.map *.lst *.elf *.bin test/*.o test/*.map test/*.lst \
-	test/*.elf test/*.bin .depend 
+	test/*.elf test/*.bin .depend test/test.grb test/test.rgb
 
 -include .depend

Diff for: sizes/sizes.py

@@ -9,7 +9,7 @@
 import tempfile
 import datetime
 from argparse import ArgumentParser
-from urlparse import urlparse
+from urllib.parse import urlparse
 
 template = 'sizes/sizes.template'
 html = 'sizes/sizes.html'
@@ -264,10 +264,10 @@ def equal_sizes(a, b):
                             '4.5.2': { 'file.bin': 23 },
                             'git': {...}'''
 
-    if a.keys() != b.keys():
+    if list(a.keys()) != list(b.keys()):
         return False
 
-    for v, s in a.iteritems():
+    for v, s in a.items():
         if v != 'git':
             if s != b[v]:
                 return False
@@ -308,12 +308,12 @@ def update_recent(version):
     increment = False
     for b in binfiles():
         size = os.path.getsize(b)
-        if not recent.has_key(version):
+        if version not in recent:
             recent[version] = {}
 
         blist = recent[version]
         bn = bname(b)
-        if not blist.has_key(bn):
+        if bn not in blist:
             blist[bn] = []
 
         bfile = blist[bn]
@@ -398,7 +398,7 @@ def prune_boring_git_sizes(branch = None):
         if rev_is_interesting(h):
             pruned.append(s)
         else:
-            print 'removing ', h
+            print('removing ', h)
 
     write_sizes(pruned, 'sizes/git_sizes.json')
 
@@ -415,7 +415,7 @@ def update_history(version, branch = None):
     for s in sizes:
         h = s['git']['hash']
         # populate known hashes
-        if s.has_key(version):
+        if version in s:
             known.add(h)
 
     try:
@@ -434,12 +434,12 @@ def update_history(version, branch = None):
 
                     rc = update_git_size(version, r, make, sizes)
                     if not rc:
-                        print '%s ok' % r
+                        print('%s ok' % r)
                     else:
-                        print '%s make failed (%s)' % (r, flavour)
+                        print('%s make failed (%s)' % (r, flavour))
             else:
                 if not quiet:
-                    print '%s already recorded' % r
+                    print('%s already recorded' % r)
     finally:
         subprocess.call(['git', 'checkout', '-q', branch])
         if os.path.exists('.depend'):

Diff for: test/make_grb.py

@@ -6,7 +6,7 @@ def g(x):
 
 h = 0
 while h < 1:
-    print '// ' + str(h)
+    print(('// ' + str(h)))
     c = colorsys.hsv_to_rgb(h, 1, 1)
-    print g(c[1] * 255), ',', g(c[0] * 255), ',', g(c[2] * 255), ','
+    print(g(c[1] * 255), ',', g(c[0] * 255), ',', g(c[2] * 255), ',')
     h += 1./240 + 1e-10

Diff for: test/make_rgb.py

@@ -6,7 +6,7 @@ def g(x):
 
 h = 0
 while h < 1:
-    print '// ' + str(h)
+    print('// ' + str(h))
     c = colorsys.hsv_to_rgb(h, 1, 1)
-    print g(c[0] * 255), ',', g(c[1] * 255), ',', g(c[2] * 255), ','
+    print(g(c[0] * 255), ',', g(c[1] * 255), ',', g(c[2] * 255), ',')
     h += 1./240 + 1e-10