Python style: remove unhelpful extra () wrapper around if conditions

Author: ldoolitt

board_support/zest/zest_setup.py

@@ -727,7 +727,7 @@ def log_step(_s, _smp, _seek, _set, _hld):
         HLD += 1
         while HLD < 16:
             SEEK = self.seeksethldsmp(SET, HLD, SMP)
-            if (SEEK != SEEK_000):
+            if SEEK != SEEK_000:
                 HLD_TIME = HLD
                 break
             HLD += 1
@@ -743,7 +743,7 @@ def log_step(_s, _smp, _seek, _set, _hld):
         SET += 1
         while SET < 16:
             SEEK = self.seeksethldsmp(SET, HLD, SMP)
-            if (SEEK != SEEK_000):
+            if SEEK != SEEK_000:
                 SET_TIME = SET
                 break
             SET += 1
@@ -766,7 +766,7 @@ def log_step(_s, _smp, _seek, _set, _hld):
             HLD += 1
             while HLD < 16:
                 SEEK = self.seeksethldsmp(SET, HLD, SMP)
-                if (SEEK != SEEK_SMP):
+                if SEEK != SEEK_SMP:
                     HLD_OK = HLD
                     break
                 HLD += 1
@@ -778,7 +778,7 @@ def log_step(_s, _smp, _seek, _set, _hld):
             SET += 1
             while SET < 16:
                 SEEK = self.seeksethldsmp(SET, HLD, SMP)
-                if (SEEK != SEEK_SMP):
+                if SEEK != SEEK_SMP:
                     SET_OK = SET
                     break
                 SET += 1

build-tools/gen_features.py

@@ -82,7 +82,7 @@ def write_vlog(basename, cfg_dict, split=False, verbose=False):
     # Use include guard for defines only
     FD.write("`ifndef __%(n)s__\n`define __%(n)s__\n\n" % {'n': basename.upper()})
     for d, v in d_dict.items():
-        if (v == 0):
+        if v == 0:
             FD.write("//")
         FD.write(d_string % d.upper())
     FD.write("\n`endif // __%s__\n" % basename.upper())

cmoc/cryomodule_test_setup.py

@@ -174,7 +174,7 @@ def fix(x, b, msg, opt=None):
 # prefix and name are used to give a helpful comment
 def set_reg(offset, prefix, name, regmap):
     val = globals()[name]  # globals() or locals()?
-    if (type(val) is list):
+    if type(val) is list:
         for i, v in enumerate(val):
             print(offset + regmap[name] + i, v, "#",
                   prefix + name + "[" + str(i) + "]")
@@ -321,7 +321,7 @@ def push_seed(addr, hf):
         hf.update(chr(jx).encode('utf-8'))
 
 
-if (prng_seed is not None):
+if prng_seed is not None:
     from hashlib import sha1
     print("# PRNG subsystem seed is '%s'" % prng_seed)
     hf = sha1()
@@ -413,6 +413,6 @@ def delay_set(ticks, addr, data):
 print("%d 1    # Flip the circle buffer" % (0x13800))
 print("%d 1    # Flip the circle buffer" % (0x13801))
 
-if (error_cnt > 0):
+if error_cnt > 0:
     print("# %d scaling errors found" % error_cnt)
     exit(1)

dsp/feedforward/cic_bank_memgen.py

@@ -94,7 +94,7 @@ def gen_array(pulse_vals, print_me=True):
     filln = 4*512 - len(pulse_vals)
     pulse_vals += [0] * filln
 
-    if (print_me):
+    if print_me:
         for x in pulse_vals:
             print(x)
 

dsp/filter_test.py

@@ -118,12 +118,12 @@ def check_tf(freq, gain, phase, tb_cfg, plot=False):
     fmeas = c_est
     fspec = tb_cfg["fcorner"]
     diff = (np.log10(fmeas) - np.log10(fspec))/np.log10(fspec)
-    if (abs(diff) > 0.1):
+    if abs(diff) > 0.1:
         print("FAIL: Measured 3dB corner (%.1f) too far from spec (%.1f)!" % (fmeas, fspec))
         fail = True
     sspec = tb_cfg["slope"]
     diff = (slope - sspec)/sspec
-    if (abs(diff) > 0.1):
+    if abs(diff) > 0.1:
         print("FAIL: Measured slope (%.3f) too far from spec (%.3f)!" % (slope, sspec))
         fail = True
 

peripheral_drivers/i2cbridge/assem.py

@@ -488,10 +488,10 @@ def pad(self, n=None):
         if n is None:
             n = (self._pc()//32)+1  # ceil(pc/32)
         n = int(n)
-        if (n < self._pc()//32):
+        if n < self._pc()//32:
             raise I2C_Assembler_Exception(f"Cannot pad to index {n} which corresponds to an address earlier than" +
                                           " the current program counter value {self._pc()}")
-        elif (n > self._INDEX_MAX):
+        elif n > self._INDEX_MAX:
             raise I2C_Assembler_Exception(f"Program counter index {n} exceeds maximum {self._INDEX_MAX}")
         self._program += super().pad(n, self._pc())
         self._check_pc()

peripheral_drivers/spi_mon_prog.py

@@ -8,7 +8,7 @@ def __init__(self, IMEM=512, RMEM=128):
     def gen(self, cmd_arr, verbose=False):
         '''cmd_arr is array of tuples: (hw_sel, rnw, command[31:0])'''
         l_cmd = len(cmd_arr)
-        if (l_cmd > self.MAX_CMD):
+        if l_cmd > self.MAX_CMD:
             print("spi_mon: SPI commands (%d) exceed instruction memory size" % l_cmd)
             return []
         imem_a = []

projects/comms_top/test/comms_top_test.py

@@ -117,13 +117,13 @@ def _badarg(self, cmd):
         print("ERROR: Bad arguments to command {}".format(cmd))
 
     def _pprint(self, cmd, args):
-        if (len(args) == 0):
+        if len(args) == 0:
             self._badarg(cmd)
             return
         print("\n> {}\n".format(" ".join(args)))
 
     def _pread(self, cmd, args):
-        if (len(args) != 1):
+        if len(args) != 1:
             self._badarg(cmd)
             return
         raddr = int(args[0].lstrip(':'), 0)
@@ -133,7 +133,7 @@ def _pread(self, cmd, args):
         print("{} {} RDATA = {} ({})".format(cmd, " ".join(args), d_hex, d_asc))
 
     def _pwrite(self, cmd, args):
-        if (len(args) != 2):
+        if len(args) != 2:
             self._badarg(cmd)
             return
         waddr = int(args[0].lstrip(':'), 0)
@@ -144,7 +144,7 @@ def _pwrite(self, cmd, args):
         print("{} {}".format(cmd, " ".join(args)))
 
     def _prdmem(self, cmd, args):
-        if (len(args) != 3):
+        if len(args) != 3:
             self._badarg(cmd)
             return
         base_addr = int(args[0].lstrip(':'), 0)
@@ -162,7 +162,7 @@ def _prdmem(self, cmd, args):
         print("{} {} : Successfully read {} memory positions".format(cmd, " ".join(args), read_length))
 
     def _pwait(self, cmd, args):
-        if (len(args) != 1):
+        if len(args) != 1:
             self._badarg(cmd)
             return
         tsleep = int(args[0])
@@ -171,7 +171,7 @@ def _pwait(self, cmd, args):
         time.sleep(tsleep)
 
     def _pcmp(self, cmd, args):
-        if (len(args) != 2):
+        if len(args) != 2:
             self._badarg(cmd)
             return
 

projects/test_marble_family/config_si570.py

@@ -37,11 +37,11 @@ def decode_settings(mbox, verbose):
     i2c_addr = mbox[96]
     config = mbox[97]
     start_freq = int.from_bytes(bytes(mbox[98:102]), 'big')  # 4 bytes, MSB-first, unused
-    if ((i2c_addr == 0) or (i2c_addr == 0xff) or (config == 0) or (config == 0xff) or (pcb_rev == 0xdeadbeef)):
+    if (i2c_addr == 0) or (i2c_addr == 0xff) or (config == 0) or (config == 0xff) or (pcb_rev == 0xdeadbeef):
         print("SI570 settings not configured through MMC,using default for {:s} v1.{:d}".format(board_name, marble_rev))
         start_freq = 0
         # use default values if it's a marble v1.2, v1.3 or marble_mini
-        if (marble_rev == 2 or marble_rev == 3 or board == 2):
+        if marble_rev == 2 or marble_rev == 3 or board == 2:
             i2c_addr = 0xee
             polarity = 0
             start_addr = 0x0d
@@ -50,7 +50,7 @@ def decode_settings(mbox, verbose):
             polarity = 0
             start_addr = 0x07
     # check the [7:6] bits of the config value is either 2'b01 or 2'b10, to make sure it valid
-    elif (((config >> 6) == 1) ^ ((config >> 6) == 2)):
+    elif ((config >> 6) == 1) ^ ((config >> 6) == 2):
         start_addr = 0x0d if (config & 0x02) else 0x07
         polarity = config & 0x01
     else:
@@ -166,7 +166,7 @@ def hw_write_prog(si570_addr, start_addr, reg):
 # check if the final output frequency is <= 50 ppm
 def check(fin):
     ppm = ((fin)*(1/args.new_freq) - 1.0)*1e6
-    if (abs(ppm) >= 50):
+    if abs(ppm) >= 50:
         raise ValueError('SI570 final frequency measurement is not correct, out of spec by %i ppm' % ppm)
 
 
@@ -212,7 +212,7 @@ def config_si570(addr, verbose):
     if args.new_freq:
         si570_addr, config_addr, fxtal, default = compute_si570(addr, "Measured", verbose)
         # if first measured frequency and new output frequency are < 10 ppm don't change/update
-        if (abs(((default)*(1/args.new_freq) - 1.0)*1e6) < 10):
+        if abs(((default)*(1/args.new_freq) - 1.0)*1e6) < 10:
             pass
         else:
             print("#######################################")