python: Run latest yapf.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
mithro · Jun 22, 2018 · a8b0c87 · a8b0c87
1 parent faa872e
commit a8b0c87
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/experiments/example/segdata.py b/experiments/example/segdata.py
@@ -78,8 +78,8 @@
         continue
 
     segname = "%s_%02x" % (
-        tiledata["cfgcol"]["BASE_FRAMEID"][2:],
-        min(tiledata["cfgcol"]["WORDS"]))
+        tiledata["cfgcol"]["BASE_FRAMEID"][2:], min(
+            tiledata["cfgcol"]["WORDS"]))
 
     if not segname in segments:
         segments[segname] = {"bits": list(), "tags": dict()}
@@ -122,9 +122,8 @@
         for bit_frame, bit_wordidx, bit_bitidx in bits[base_frame][wordidx]:
             segments[segname]["bits"].append(
                 "%02x_%02x_%02x" % (
-                    bit_frame - base_frame,
-                    bit_wordidx - min(tiledata["cfgcol"]["WORDS"]),
-                    bit_bitidx))
+                    bit_frame - base_frame, bit_wordidx - min(
+                        tiledata["cfgcol"]["WORDS"]), bit_bitidx))
 
     segments[segname]["bits"].sort()
 

diff --git a/htmlgen/htmlgen.py b/htmlgen/htmlgen.py
@@ -709,9 +709,9 @@ def print_table_header():
         "  unused: %d, unknown: %d, known: %d, total: %d, percentage: %.2f%% (%.2f%%)"
         % (
             unused_bits, unknown_bits, known_bits,
-            unused_bits + unknown_bits + known_bits,
-            100 * known_bits / (unknown_bits + unused_bits + known_bits),
-            100 * (known_bits + unused_bits) /
+            unused_bits + unknown_bits + known_bits, 100 * known_bits /
+            (unknown_bits + unused_bits + known_bits), 100 *
+            (known_bits + unused_bits) /
             (unknown_bits + unused_bits + known_bits)))
 
 

diff --git a/tools/bittool.cc b/tools/bittool.cc
@@ -11,7 +11,7 @@ namespace xc7series = prjxray::xilinx::xc7series;
 
 struct Action {
 	std::string name;
-	std::function<int(int, char* [])> handler;
+	std::function<int(int, char*[])> handler;
 };
 
 int ListConfigPackets(int argc, char* argv[]) {

diff --git a/tools/fasm2frame.py b/tools/fasm2frame.py
@@ -95,8 +95,8 @@ def dump_frames_verbose(frames):
     for addr in sorted(frames.keys()):
         words = frames[addr]
         print(
-            '0x%08X ' % addr + ', '.join(['0x%08X' % w
-                                          for w in words]) + '...')
+            '0x%08X ' % addr + ', '.join(['0x%08X' % w for w in words]) +
+            '...')
 
 
 def dump_frames_sparse(frames):

diff --git a/tools/simpleroute.py b/tools/simpleroute.py
@@ -84,8 +84,8 @@ def db_gen():
                         node_node_pip[src_node] = dict()
                     if dst_node not in reverse_node_node:
                         reverse_node_node[dst_node] = set()
-                    node_node_pip[src_node][dst_node] = "%s.%s.%s" % (
-                        tile, dst, src)
+                    node_node_pip[src_node][
+                        dst_node] = "%s.%s.%s" % (tile, dst, src)
                     reverse_node_node[dst_node].add(src_node)
 
     return type_to_tiles, grid_to_tile, nodes, node_node_pip, reverse_node_node
@@ -141,8 +141,8 @@ def write_scores(nodes, count):
         try:
             write_scores(set([dst_node]), 1)
         except RecursionError as e:
-            raise Exception("Could not find route for node %s" %
-                            (dst_node, )) from None
+            raise Exception(
+                "Could not find route for node %s" % (dst_node, )) from None
         print("  route length: %d" % node_scores[src_node])
 
         count = 0