From 498a7acbe2a708148ed7cbf6934debb1193f656d Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sat, 22 Aug 2015 09:43:14 +0200 Subject: icebox: python3 --- icebox/icebox_vlog.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'icebox/icebox_vlog.py') diff --git a/icebox/icebox_vlog.py b/icebox/icebox_vlog.py index 9d27db6..c3f6df3 100755 --- a/icebox/icebox_vlog.py +++ b/icebox/icebox_vlog.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python3 # # Copyright (C) 2015 Clifford Wolf # @@ -15,9 +15,6 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -from __future__ import division -from __future__ import print_function - import icebox import getopt, sys, re @@ -211,7 +208,7 @@ for bit in ic.extra_bits: s2 = (pin_entry[0], pin_entry[1], "padin_%d" % pin_entry[2]) extra_connections.append((s1, s2)) -for idx, tile in ic.io_tiles.items(): +for idx, tile in list(ic.io_tiles.items()): tc = icebox.tileconfig(tile) iocells_type[(idx[0], idx[1], 0)] = ["0" for i in range(6)] iocells_type[(idx[0], idx[1], 1)] = ["0" for i in range(6)] @@ -834,7 +831,7 @@ if do_collect: vec_ports_dir[match.group(2)] = match.group(1) else: new_text_ports.add(port) - for port, direct in vec_ports_dir.items(): + for port, direct in list(vec_ports_dir.items()): min_idx = vec_ports_min[port] max_idx = vec_ports_max[port] new_text_ports.add("%s [%d:%d] %s " % (direct, max_idx, min_idx, port)) @@ -874,7 +871,7 @@ if strip_comments: print() if do_collect: - for port, direct in vec_ports_dir.items(): + for port, direct in list(vec_ports_dir.items()): min_idx = vec_ports_min[port] max_idx = vec_ports_max[port] for i in range(min_idx, max_idx+1): -- cgit v1.2.3