fix for python 2.6.6

1 files changed, 47 insertions, 45 deletions

diff --git a/tests/share/generate.py b/tests/share/generate.py
index a06a642d..bb96fec6 100644
--- a/tests/share/generate.py
+++ b/tests/share/generate.py
@@ -25,49 +25,51 @@ def maybe_plus_x(expr):
         return expr
 
 for idx in range(100):
-    with file('temp/uut_%05d.v' % idx, 'w') as f, redirect_stdout(f):
-        if random.choice(['bin', 'uni']) == 'bin':
-            print('module uut_%05d(a, b, c, d, x, s, y);' % (idx))
-            op = random.choice([
-                random.choice(['+', '-', '*', '/', '%']),
-                random.choice(['<', '<=', '==', '!=', '===', '!==', '>=', '>' ]),
-                random.choice(['<<', '>>', '<<<', '>>>']),
-                random.choice(['|', '&', '^', '~^', '||', '&&']),
-            ])
-            print('  input%s [%d:0] a;' % (random.choice(['', ' signed']), random.randint(0, 8)))
-            print('  input%s [%d:0] b;' % (random.choice(['', ' signed']), random.randint(0, 8)))
-            print('  input%s [%d:0] c;' % (random.choice(['', ' signed']), random.randint(0, 8)))
-            print('  input%s [%d:0] d;' % (random.choice(['', ' signed']), random.randint(0, 8)))
-            print('  input%s [%d:0] x;' % (random.choice(['', ' signed']), random.randint(0, 8)))
-            print('  input s;')
-            print('  output [%d:0] y;' % random.randint(0, 8))
-            print('  assign y = (s ? %s(%s %s %s) : %s(%s %s %s))%s;' %
-                    (random.choice(['', '$signed', '$unsigned']), maybe_plus_x('a'), op, maybe_plus_x('b'),
-                     random.choice(['', '$signed', '$unsigned']), maybe_plus_x('c'), op, maybe_plus_x('d'),
-                     random_plus_x() if random.randint(0, 4) == 0 else ''))
-            print('endmodule')
-        else:
-            print('module uut_%05d(a, b, x, s, y);' % (idx))
-            op = random.choice(['~', '-', '!'])
-            print('  input%s [%d:0] a;' % (random.choice(['', ' signed']), random.randint(0, 8)))
-            print('  input%s [%d:0] b;' % (random.choice(['', ' signed']), random.randint(0, 8)))
-            print('  input%s [%d:0] x;' % (random.choice(['', ' signed']), random.randint(0, 8)))
-            print('  input s;')
-            print('  output [%d:0] y;' % random.randint(0, 8))
-            print('  assign y = (s ? %s(%s%s) : %s(%s%s))%s;' %
-                    (random.choice(['', '$signed', '$unsigned']), op, maybe_plus_x('a'),
-                     random.choice(['', '$signed', '$unsigned']), op, maybe_plus_x('b'),
-                     random_plus_x() if random.randint(0, 4) == 0 else ''))
-            print('endmodule')
-    with file('temp/uut_%05d.ys' % idx, 'w') as f, redirect_stdout(f):
-        print('read_verilog temp/uut_%05d.v' % idx)
-        print('proc;;')
-        print('copy uut_%05d gold' % idx)
-        print('rename uut_%05d gate' % idx)
-        print('tee -a temp/all_share_log.txt log')
-        print('tee -a temp/all_share_log.txt log #job# uut_%05d' % idx)
-        print('tee -a temp/all_share_log.txt wreduce')
-        print('tee -a temp/all_share_log.txt share -aggressive gate')
-        print('miter -equiv -flatten -ignore_gold_x -make_outputs -make_outcmp gold gate miter')
-        print('sat -set-def-inputs -verify -prove trigger 0 -show-inputs -show-outputs miter')
+    with file('temp/uut_%05d.v' % idx, 'w') as f:
+        with redirect_stdout(f):
+            if random.choice(['bin', 'uni']) == 'bin':
+                print('module uut_%05d(a, b, c, d, x, s, y);' % (idx))
+                op = random.choice([
+                    random.choice(['+', '-', '*', '/', '%']),
+                    random.choice(['<', '<=', '==', '!=', '===', '!==', '>=', '>' ]),
+                    random.choice(['<<', '>>', '<<<', '>>>']),
+                    random.choice(['|', '&', '^', '~^', '||', '&&']),
+                ])
+                print('  input%s [%d:0] a;' % (random.choice(['', ' signed']), random.randint(0, 8)))
+                print('  input%s [%d:0] b;' % (random.choice(['', ' signed']), random.randint(0, 8)))
+                print('  input%s [%d:0] c;' % (random.choice(['', ' signed']), random.randint(0, 8)))
+                print('  input%s [%d:0] d;' % (random.choice(['', ' signed']), random.randint(0, 8)))
+                print('  input%s [%d:0] x;' % (random.choice(['', ' signed']), random.randint(0, 8)))
+                print('  input s;')
+                print('  output [%d:0] y;' % random.randint(0, 8))
+                print('  assign y = (s ? %s(%s %s %s) : %s(%s %s %s))%s;' %
+                        (random.choice(['', '$signed', '$unsigned']), maybe_plus_x('a'), op, maybe_plus_x('b'),
+                         random.choice(['', '$signed', '$unsigned']), maybe_plus_x('c'), op, maybe_plus_x('d'),
+                         random_plus_x() if random.randint(0, 4) == 0 else ''))
+                print('endmodule')
+            else:
+                print('module uut_%05d(a, b, x, s, y);' % (idx))
+                op = random.choice(['~', '-', '!'])
+                print('  input%s [%d:0] a;' % (random.choice(['', ' signed']), random.randint(0, 8)))
+                print('  input%s [%d:0] b;' % (random.choice(['', ' signed']), random.randint(0, 8)))
+                print('  input%s [%d:0] x;' % (random.choice(['', ' signed']), random.randint(0, 8)))
+                print('  input s;')
+                print('  output [%d:0] y;' % random.randint(0, 8))
+                print('  assign y = (s ? %s(%s%s) : %s(%s%s))%s;' %
+                        (random.choice(['', '$signed', '$unsigned']), op, maybe_plus_x('a'),
+                         random.choice(['', '$signed', '$unsigned']), op, maybe_plus_x('b'),
+                         random_plus_x() if random.randint(0, 4) == 0 else ''))
+                print('endmodule')
+    with file('temp/uut_%05d.ys' % idx, 'w') as f:
+        with redirect_stdout(f):
+            print('read_verilog temp/uut_%05d.v' % idx)
+            print('proc;;')
+            print('copy uut_%05d gold' % idx)
+            print('rename uut_%05d gate' % idx)
+            print('tee -a temp/all_share_log.txt log')
+            print('tee -a temp/all_share_log.txt log #job# uut_%05d' % idx)
+            print('tee -a temp/all_share_log.txt wreduce')
+            print('tee -a temp/all_share_log.txt share -aggressive gate')
+            print('miter -equiv -flatten -ignore_gold_x -make_outputs -make_outcmp gold gate miter')
+            print('sat -set-def-inputs -verify -prove trigger 0 -show-inputs -show-outputs miter')