From ca68195b5d12c5410cfac8d459a0b0902c4c72c7 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Tue, 1 Dec 2020 18:50:12 +0100 Subject: fpga: Remove Python2 support from build system - 2to3 was used to convert the Python scripts, except where the tool choked and manual intervention was required - All references to "python" where replaced with "python3" - buffer() was replaced by memoryview() --- fpga/usrp3/tools/scripts/viv_gen_ip_makefile.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'fpga/usrp3/tools/scripts/viv_gen_ip_makefile.py') diff --git a/fpga/usrp3/tools/scripts/viv_gen_ip_makefile.py b/fpga/usrp3/tools/scripts/viv_gen_ip_makefile.py index 87572e86e..dd82e086e 100644 --- a/fpga/usrp3/tools/scripts/viv_gen_ip_makefile.py +++ b/fpga/usrp3/tools/scripts/viv_gen_ip_makefile.py @@ -1,7 +1,7 @@ -#! /usr/bin/python +#! /usr/bin/env python3 -import sys, os -import collections +import sys +import os import argparse import datetime @@ -10,7 +10,8 @@ def get_options(): parser = argparse.ArgumentParser(description='Create a Makefile for Xilinx IP.') parser.add_argument('--ip_name', type=str, default=None, help='Name for the IP core') parser.add_argument('--dest', type=str, default=None, help='Destination directory') - parser.add_argument('--copright_auth', type=str, default='Ettus Research', help='Copyright author') + parser.add_argument('--copright_auth', + type=str, default='Ettus Research', help='Copyright author') args = parser.parse_args() if not args.ip_name: print('ERROR: Please specify a name for the IP core\n') @@ -39,13 +40,13 @@ $({ip_srcs_var}) $({ip_outs_var}) : $(IP_DIR)/{ip_name}/{ip_name}.xci """ def main(): - args = get_options(); - + args = get_options() transform = {} transform['ip_name'] = args.ip_name transform['ip_srcs_var'] = 'IP_' + args.ip_name.upper() + '_SRCS' transform['ip_outs_var'] = 'IP_' + args.ip_name.upper() + '_OUTS' - transform['copyright'] = 'Copyright ' + str(datetime.datetime.now().year) + ' ' + args.copright_auth + transform['copyright'] = 'Copyright {} {}'.format( + datetime.datetime.now().year, args.copright_auth) with open(os.path.join(args.dest, 'Makefile.inc'), 'w') as mak_file: mak_file.write(g_makefile_template.format(**transform)) -- cgit v1.2.3