Replaced calls to "python" with "python2"

icebox/Makefile

@@ -3,11 +3,11 @@ DESTDIR = /usr/local
 all: chipdb-1k.txt chipdb-8k.txt
 
 chipdb-1k.txt: icebox.py iceboxdb.py icebox_chipdb.py
-	python icebox_chipdb.py > chipdb-1k.new
+	python2 icebox_chipdb.py > chipdb-1k.new
 	mv chipdb-1k.new chipdb-1k.txt
 
 chipdb-8k.txt: icebox.py iceboxdb.py icebox_chipdb.py
-	python icebox_chipdb.py -8 > chipdb-8k.new
+	python2 icebox_chipdb.py -8 > chipdb-8k.new
 	mv chipdb-8k.new chipdb-8k.txt
 
 clean:

icebox/icebox.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 #  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #

icebox/icebox_chipdb.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 #  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #

icebox/icebox_diff.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 #  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #

icebox/icebox_explain.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 #  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #

icebox/icebox_html.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 #  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #
@@ -566,7 +566,7 @@ if outdir is not None:
                 print_tile(x, y)
 
     print("Writing %s/%s..." % (outdir, chipdbfile), file=stdout)
-    os.system("python icebox_chipdb.py > %s/%s" % (outdir, chipdbfile))
+    os.system("python2 icebox_chipdb.py > %s/%s" % (outdir, chipdbfile))
 
     sys.stdout = stdout
     

icebox/icebox_maps.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 #  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #

icebox/icebox_vlog.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 #  Copyright (C) 2015  Clifford Wolf <clifford@clifford.at>
 #

icefuzz/Makefile

@@ -27,8 +27,8 @@ else
 	cp cached_ramb_8k.txt bitdata_ramb_8k.txt
 	cp cached_ramt_8k.txt bitdata_ramt_8k.txt
 endif
-	python database.py
-	python export.py
+	python2 database.py
+	python2 export.py
 	diff -U0 cached_io.txt bitdata_io.txt || cp -v bitdata_io.txt cached_io.txt
 	diff -U0 cached_logic.txt bitdata_logic.txt || cp -v bitdata_logic.txt cached_logic.txt
 	diff -U0 cached_ramb.txt bitdata_ramb.txt || cp -v bitdata_ramb.txt cached_ramb.txt
@@ -63,13 +63,13 @@ datafiles: $(addprefix data_,$(addsuffix .txt,$(TESTS)))
 define data_template
 data_$(1).txt: make_$(1).py ../icepack/icepack
 ifeq ($(EIGTHK),_8k)
-	ICE8KPINS=1 python make_$(1).py
+	ICE8KPINS=1 python2 make_$(1).py
 	ICEDEV=hx8k-ct256 $$(MAKE) -C work_$(1)
-	python extract.py -8 work_$(1)/*.glb > $$@
+	python2 extract.py -8 work_$(1)/*.glb > $$@
 else
-	python make_$(1).py
+	python2 make_$(1).py
 	$$(MAKE) -C work_$(1)
-	python extract.py work_$(1)/*.glb > $$@
+	python2 extract.py work_$(1)/*.glb > $$@
 endif
 endef
 

icefuzz/convert_ram8k.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # convert 1k ramb/ramt to 8k ramb/ramt and vice versa
 
 subst_rules = [

icefuzz/database.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/export.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/extract.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/glbmapbits.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_binop.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_cluster.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_fanout.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_fflogic.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_gbio.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_gbio2.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_io.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_iopack.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_logic.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_mesh.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_pin2pin.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_pll.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_prim.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/make_ram40.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 
 from __future__ import division
 from __future__ import print_function

icefuzz/pinloc/pinloc-1k-tq144.sh

@@ -29,5 +29,5 @@ pins="
 
 set -ex
 make -f pinloc-1k-tq144.mk -j4
-python pinlocdb.py pinloc-1k-tq144_*.exp > pinloc-1k-tq144.txt
+python2 pinlocdb.py pinloc-1k-tq144_*.exp > pinloc-1k-tq144.txt
 

icefuzz/pinloc/pinloc-8k-ct256.sh

@@ -41,4 +41,4 @@ pins="
 
 set -ex
 make -f pinloc-8k-ct256.mk -j4
-python pinlocdb.py pinloc-8k-ct256_*.exp > pinloc-8k-ct256.txt
+python2 pinlocdb.py pinloc-8k-ct256_*.exp > pinloc-8k-ct256.txt

icefuzz/tests/colbuf.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # for f in colbuf_io.work/*.exp colbuf_logic.work/*.exp colbuf_ram.work/*.exp; do
-# 	python colbuf.py $f
+# 	python2 colbuf.py $f
 # done | sort -u > colbuf.txt
 
 get_colbuf_data()

icefuzz/tests/colbuf_8k.sh

@@ -2,7 +2,7 @@
 
 for f in colbuf_io_8k.work/*.exp colbuf_logic_8k.work/*.exp colbuf_ram_8k.work/*.exp; do
 	echo $f >&2
-	python colbuf.py $f
+	python2 colbuf.py $f
 done | sort -u > colbuf_8k.txt
 
 get_colbuf_data()

icefuzz/tests/ioctrl.sh

@@ -24,7 +24,7 @@ done
 set +x
 echo "--snip--"
 for pin in $pins; do
-	python ../ioctrl.py ioctrl_${pin}.exp
+	python2 ../ioctrl.py ioctrl_${pin}.exp
 done | tee ioctrl_db.txt
 echo "--snap--"
 

icefuzz/tests/test_pio.sh

@@ -49,7 +49,7 @@ for OUTTYPE in 0000 0110 1010 1110 0101 1001 1101 \
 		EOT
 		bash ../../icecube.sh ${pf}.v > ${pf}.log 2>&1
 	fi
-	python ../../../icebox/icebox_vlog.py -P ${pf}.psb ${pf}.txt > ${pf}_out.v
+	python2 ../../../icebox/icebox_vlog.py -P ${pf}.psb ${pf}.txt > ${pf}_out.v
 	iverilog -D"VCDFILE=\"${pf}_tb.vcd\"" -DINTYPE=${INTYPE} -o ${pf}_tb \
 			-s testbench ../test_pio_tb.v ${pf}.v ${pf}_out.v $lattice_simlib 2> /dev/null
 	./${pf}_tb > ${pf}_tb.txt