From 8d61ee5ac07a91e441b079f49859d0ce2618dab6 Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Thu, 13 Dec 2018 18:23:28 -0800 Subject: [PATCH] `make format` on new files. Signed-off-by: Tim 'mithro' Ansell --- fuzzers/074-dump_all/reduce_tile_types.py | 1 + prjxray/xjson.py | 6 ++++-- prjxray/xyaml.py | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/fuzzers/074-dump_all/reduce_tile_types.py b/fuzzers/074-dump_all/reduce_tile_types.py index 7e8bdcf9..bbe81a93 100644 --- a/fuzzers/074-dump_all/reduce_tile_types.py +++ b/fuzzers/074-dump_all/reduce_tile_types.py @@ -20,6 +20,7 @@ import functools from prxray import xjson + def check_and_strip_prefix(name, prefix): assert name.startswith(prefix), repr((name, prefix)) return name[len(prefix):] diff --git a/prjxray/xjson.py b/prjxray/xjson.py index a512dc99..ba675dc1 100644 --- a/prjxray/xjson.py +++ b/prjxray/xjson.py @@ -13,7 +13,7 @@ def extract_numbers(s): ('VBRK_WR', 1, 'END', 2) """ bits = [] - for m in re.finditer("([^0-9]*)([0-9]*)",s): + for m in re.finditer("([^0-9]*)([0-9]*)", s): if m.group(1): bits.append(m.group(1)) if m.group(2): @@ -25,10 +25,12 @@ def sort(data): # FIXME: We assume that a list is a tileconn.json format... if isinstance(data, list): for o in data: - o['wire_pairs'].sort(key=lambda o: (extract_numbers(o[0]), extract_numbers(o[1]))) + o['wire_pairs'].sort( + key=lambda o: (extract_numbers(o[0]), extract_numbers(o[1]))) data.sort(key=lambda o: (o['tile_types'], o['grid_deltas'])) else: + def walker(o, f): if isinstance(o, dict): for i in o.values(): diff --git a/prjxray/xyaml.py b/prjxray/xyaml.py index a7a8754d..5b9d8a7f 100644 --- a/prjxray/xyaml.py +++ b/prjxray/xyaml.py @@ -26,7 +26,8 @@ def tojson(f): class XYamlTest(unittest.TestCase): def test(self): - s = io.StringIO("""\ + s = io.StringIO( + """\ ! idcode: 0x362d093 global_clock_regions: @@ -40,7 +41,8 @@ global_clock_regions: frame_count: 42 """) djson = tojson(s) - self.assertMultiLineEqual(djson, """\ + self.assertMultiLineEqual( + djson, """\ { "global_clock_regions": { "top": { @@ -62,6 +64,7 @@ global_clock_regions: "idcode": 56807571 }""") + if __name__ == "__main__": import sys if len(sys.argv) == 1: