From 4fe294df1938fff17294bbcc812a1b3416023767 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Fri, 5 Oct 2018 09:36:33 -0700
Subject: [PATCH] Run make format.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 fuzzers/074-dump_all/generate_grid.py |  3 +--
 tools/fasm2frame.py                   | 18 ++++++++---------
 tools/segprint2fasm.py                | 28 +++++++++++++--------------
 utils/merge_tilegrid.py               |  5 ++++-
 utils/segprint.py                     | 18 ++++++++---------
 5 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/fuzzers/074-dump_all/generate_grid.py b/fuzzers/074-dump_all/generate_grid.py
index d401cbcd..3860be39 100644
--- a/fuzzers/074-dump_all/generate_grid.py
+++ b/fuzzers/074-dump_all/generate_grid.py
@@ -540,8 +540,7 @@ def generate_tileconn(pool, node_tree, nodes, wire_map, grid):
             bar.update(idx)
             raw_node_data.append(node)
             process_node(
-                tileconn, key_history, node, wire_map, node_tree,
-                grid)
+                tileconn, key_history, node, wire_map, node_tree, grid)
             bar.update(idx + 1)
 
     tileconn = flatten_tile_conn(tileconn)
diff --git a/tools/fasm2frame.py b/tools/fasm2frame.py
index bf84b901..cf84e557 100755
--- a/tools/fasm2frame.py
+++ b/tools/fasm2frame.py
@@ -160,21 +160,19 @@ def run(f_in, f_out, sparse=False, debug=False):
         new_grid = json.load(f)
 
     # TODO: Migrate to new tilegrid format via library.
-    grid = {
-            'tiles': new_grid,
-            'segments': {}
-    }
+    grid = {'tiles': new_grid, 'segments': {}}
 
     for tile in grid['tiles'].values():
         if 'segment' in tile:
             segment = tile['segment']
             grid['segments'][segment] = {
-                    'baseaddr': [
-                            tile['baseaddr'], tile['offset'],
-                    ],
-                    'type': tile['segment_type'],
-                    'frames': tile['frames'],
-                    'words': tile['words'],
+                'baseaddr': [
+                    tile['baseaddr'],
+                    tile['offset'],
+                ],
+                'type': tile['segment_type'],
+                'frames': tile['frames'],
+                'words': tile['words'],
             }
 
     if not sparse:
diff --git a/tools/segprint2fasm.py b/tools/segprint2fasm.py
index 0a67c8e0..6620c6d9 100755
--- a/tools/segprint2fasm.py
+++ b/tools/segprint2fasm.py
@@ -76,10 +76,7 @@ def run(f_in, f_out, sparse=False):
         new_grid = json.load(f)
 
     # TODO: Migrate to new tilegrid format via library.
-    grid = {
-            'tiles': new_grid,
-            'segments': {}
-    }
+    grid = {'tiles': new_grid, 'segments': {}}
 
     for tilename, tile in grid['tiles'].items():
         if 'segment' in tile:
@@ -87,19 +84,22 @@ def run(f_in, f_out, sparse=False):
 
             if segment not in grid['segments']:
                 grid['segments'][segment] = {
-                        'baseaddr': (
-                                tile['baseaddr'], tile['offset'],
-                        ),
-                        'type': tile['segment_type'],
-                        'frames': tile['frames'],
-                        'words': tile['words'],
-                        'tiles': [tilename]
+                    'baseaddr': (
+                        tile['baseaddr'],
+                        tile['offset'],
+                    ),
+                    'type': tile['segment_type'],
+                    'frames': tile['frames'],
+                    'words': tile['words'],
+                    'tiles': [tilename]
                 }
             else:
                 assert grid['segments'][segment]['baseaddr'] == (
-                                tile['baseaddr'], tile['offset'],
-                        )
-                assert grid['segments'][segment]['type'] == tile['segment_type']
+                    tile['baseaddr'],
+                    tile['offset'],
+                )
+                assert grid['segments'][segment]['type'] == tile[
+                    'segment_type']
                 assert grid['segments'][segment]['frames'] == tile['frames']
                 assert grid['segments'][segment]['words'] == tile['words']
 
diff --git a/utils/merge_tilegrid.py b/utils/merge_tilegrid.py
index 828aa192..b9b171cb 100644
--- a/utils/merge_tilegrid.py
+++ b/utils/merge_tilegrid.py
@@ -1,6 +1,7 @@
 import json
 import argparse
 
+
 def main():
     parser = argparse.ArgumentParser()
 
@@ -24,7 +25,8 @@ def main():
         if tile in base_grid:
             for k in overlay_grid[tile]:
                 if k in base_grid[tile]:
-                    assert base_grid[tile][k] == overlay_grid[tile][k], (k, base_grid[tile][k], overlay_grid[tile][k])
+                    assert base_grid[tile][k] == overlay_grid[tile][k], (
+                        k, base_grid[tile][k], overlay_grid[tile][k])
                 else:
                     base_grid[tile][k] = overlay_grid[tile][k]
         else:
@@ -33,5 +35,6 @@ def main():
     with open(args.output_grid, 'w') as f:
         json.dump(base_grid, f, indent=2)
 
+
 if __name__ == '__main__':
     main()
diff --git a/utils/segprint.py b/utils/segprint.py
index da745574..cbc73403 100755
--- a/utils/segprint.py
+++ b/utils/segprint.py
@@ -51,21 +51,19 @@ with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"),
     new_grid = json.load(f)
 
 # TODO: Migrate to new tilegrid format via library.
-grid = {
-        'tiles': new_grid,
-        'segments': {}
-}
+grid = {'tiles': new_grid, 'segments': {}}
 
 for tile in grid['tiles'].values():
     if 'segment' in tile:
         segment = tile['segment']
         grid['segments'][segment] = {
-                'baseaddr': [
-                        tile['baseaddr'], tile['offset'],
-                ],
-                'type': tile['segment_type'],
-                'frames': tile['frames'],
-                'words': tile['words'],
+            'baseaddr': [
+                tile['baseaddr'],
+                tile['offset'],
+            ],
+            'type': tile['segment_type'],
+            'frames': tile['frames'],
+            'words': tile['words'],
         }
 
 bitdata = dict()