From 5390c45e0448bb9be7cb87e71bf0ac1630144532 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Sun, 17 Jul 2016 16:16:13 -0700 Subject: [PATCH] Fix Python 2 vs 3 breakage relating to hex(). In Python 2, hex() of large ints has a "L" on the end. --- firmware/tools/extract_svf_data_xc2c64a.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/tools/extract_svf_data_xc2c64a.py b/firmware/tools/extract_svf_data_xc2c64a.py index ee504c3c1..1c1b8c1b5 100755 --- a/firmware/tools/extract_svf_data_xc2c64a.py +++ b/firmware/tools/extract_svf_data_xc2c64a.py @@ -44,11 +44,11 @@ f = open(args.input_file_path, 'r') namespaces, variable_name = crack_variable_path(args.variable_path) def to_hex(value, length_bits): - return hex(value)[2:].zfill((length_bits + 3) >> 2) + return ('%x' % value).zfill((length_bits + 3) >> 2) def long_int_to_bytes(n, bit_count): byte_count = (bit_count + 7) >> 3 - h = hex(n)[2:].zfill(byte_count * 2) + h = ('%x' % n).zfill(byte_count * 2) return [int(h[n:n+2], 16) for n in range(0, len(h), 2)] re_sdr = re.compile(r'^(?P\d+)\s*TDI\s*\((?P[0-9A-F]+)\)(|\s*SMASK\s*\((?P[0-9A-F]+)\))(|\s*TDO\s*\((?P[0-9A-F]+)\))(|\s*MASK\s*\((?P[0-9A-F]+)\))\s*;$')