pylint: enforce indentation (W0311) (commaai#24039)

* pylint: enforce indentation (W0311)

* few more

Author: adeebshihadeh

.pylintrc

@@ -54,7 +54,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=C,R,W0613,W0511,W0212,W0201,W0311,W0106,W0603,W0621,W0703,W1201,W1203,E1136,W1514
+disable=C,R,W0613,W0511,W0212,W0201,W0106,W0603,W0621,W0703,W1201,W1203,E1136,W1514
 
 
 # Enable the message, report, category or checker with the given id(s). You can

common/kalman/tests/test_simple_kalman.py

@@ -36,8 +36,8 @@ def test_getter_setter(self):
     self.assertEqual(self.kf.x, [[1.0], [1.0]])
 
   def update_returns_state(self):
-      x = self.kf.update(100)
-      self.assertEqual(x, self.kf.x)
+    x = self.kf.update(100)
+    self.assertEqual(x, self.kf.x)
 
   def test_old_equal_new(self):
     for _ in range(1000):

common/logging_extra.py

@@ -172,33 +172,33 @@ def findCaller(self, stack_info=False, stacklevel=1):
     #On some versions of IronPython, currentframe() returns None if
     #IronPython isn't run with -X:Frames.
     if f is not None:
-        f = f.f_back
+      f = f.f_back
     orig_f = f
     while f and stacklevel > 1:
-        f = f.f_back
-        stacklevel -= 1
+      f = f.f_back
+      stacklevel -= 1
     if not f:
-        f = orig_f
+      f = orig_f
     rv = "(unknown file)", 0, "(unknown function)", None
     while hasattr(f, "f_code"):
-        co = f.f_code
-        filename = os.path.normcase(co.co_filename)
-
-        # TODO: is this pylint exception correct?
-        if filename == _srcfile:  # pylint: disable=comparison-with-callable
-            f = f.f_back
-            continue
-        sinfo = None
-        if stack_info:
-            sio = io.StringIO()
-            sio.write('Stack (most recent call last):\n')
-            traceback.print_stack(f, file=sio)
-            sinfo = sio.getvalue()
-            if sinfo[-1] == '\n':
-                sinfo = sinfo[:-1]
-            sio.close()
-        rv = (co.co_filename, f.f_lineno, co.co_name, sinfo)
-        break
+      co = f.f_code
+      filename = os.path.normcase(co.co_filename)
+
+      # TODO: is this pylint exception correct?
+      if filename == _srcfile:  # pylint: disable=comparison-with-callable
+        f = f.f_back
+        continue
+      sinfo = None
+      if stack_info:
+        sio = io.StringIO()
+        sio.write('Stack (most recent call last):\n')
+        traceback.print_stack(f, file=sio)
+        sinfo = sio.getvalue()
+        if sinfo[-1] == '\n':
+          sinfo = sinfo[:-1]
+        sio.close()
+      rv = (co.co_filename, f.f_lineno, co.co_name, sinfo)
+      break
     return rv
 
 if __name__ == "__main__":

selfdrive/boardd/tests/test_boardd_api.py

@@ -74,4 +74,4 @@ def test_performance(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
+  unittest.main()

selfdrive/camerad/test/get_thumbnails_for_segment.py

@@ -24,9 +24,9 @@
   lr = list(LogReader(path))
 
   for msg in tqdm(lr):
-      if msg.which() == 'thumbnail':
-          with open(os.path.join(out_path, f"{msg.thumbnail.frameId}.jpg"), 'wb') as f:
-              f.write(msg.thumbnail.thumbnail)
-      elif msg.which() == 'navThumbnail':
-          with open(os.path.join(out_path, f"nav_{msg.navThumbnail.frameId}.jpg"), 'wb') as f:
-              f.write(msg.navThumbnail.thumbnail)
+    if msg.which() == 'thumbnail':
+      with open(os.path.join(out_path, f"{msg.thumbnail.frameId}.jpg"), 'wb') as f:
+        f.write(msg.thumbnail.thumbnail)
+    elif msg.which() == 'navThumbnail':
+      with open(os.path.join(out_path, f"nav_{msg.navThumbnail.frameId}.jpg"), 'wb') as f:
+        f.write(msg.navThumbnail.thumbnail)

selfdrive/car/honda/interface.py

@@ -404,7 +404,7 @@ def update(self, c, can_strings):
       # do enable on both accel and decel buttons
       if not self.CP.pcmCruise:
         if b.type in (ButtonType.accelCruise, ButtonType.decelCruise) and not b.pressed:
-            events.add(EventName.buttonEnable)
+          events.add(EventName.buttonEnable)
 
       # do disable on button down
       if b.type == ButtonType.cancel and b.pressed:

selfdrive/car/nissan/carcontroller.py

@@ -58,14 +58,14 @@ def update(self, c, CS, frame, actuators, cruise_cancel, hud_alert,
     self.last_angle = apply_angle
 
     if self.CP.carFingerprint in (CAR.ROGUE, CAR.XTRAIL, CAR.ALTIMA) and cruise_cancel:
-        can_sends.append(nissancan.create_acc_cancel_cmd(self.packer, self.car_fingerprint, CS.cruise_throttle_msg, frame))
+      can_sends.append(nissancan.create_acc_cancel_cmd(self.packer, self.car_fingerprint, CS.cruise_throttle_msg, frame))
 
     # TODO: Find better way to cancel!
     # For some reason spamming the cancel button is unreliable on the Leaf
     # We now cancel by making propilot think the seatbelt is unlatched,
     # this generates a beep and a warning message every time you disengage
     if self.CP.carFingerprint in (CAR.LEAF, CAR.LEAF_IC) and frame % 2 == 0:
-        can_sends.append(nissancan.create_cancel_msg(self.packer, CS.cancel_msg, cruise_cancel))
+      can_sends.append(nissancan.create_cancel_msg(self.packer, CS.cancel_msg, cruise_cancel))
 
     can_sends.append(nissancan.create_steering_control(
         self.packer, apply_angle, frame, c.enabled, self.lkas_max_torque))

selfdrive/car/subaru/subarucan.py

@@ -66,7 +66,7 @@ def create_es_lkas(packer, es_lkas_msg, enabled, visual_alert, left_line, right_
     values["LKAS_ACTIVE"] = 1 # Show LKAS lane lines
     values["LKAS_Dash_State"] = 2 # Green enabled indicator
   else:
-     values["LKAS_Dash_State"] = 0 # LKAS Not enabled
+    values["LKAS_Dash_State"] = 0 # LKAS Not enabled
 
   values["LKAS_Left_Line_Visible"] = int(left_line)
   values["LKAS_Right_Line_Visible"] = int(right_line)

selfdrive/car/tests/test_fingerprints.py

@@ -37,12 +37,12 @@ def check_fingerprint_consistency(f1, f2):
   is_f1_in_f2 = True
   for k in f1:
     if (k not in f2 or f1[k] != f2[k]) and k < max_msg:
-       is_f1_in_f2 = False
+      is_f1_in_f2 = False
 
   is_f2_in_f1 = True
   for k in f2:
     if (k not in f1 or f2[k] != f1[k]) and k < max_msg:
-       is_f2_in_f1 = False
+      is_f2_in_f1 = False
 
   return not is_f1_in_f2 and not is_f2_in_f1
 

selfdrive/debug/show_matching_cars.py

@@ -10,11 +10,11 @@
 
 
 for addr, l in fingerprint.items():
-    dat = messaging.new_message('can', 1)
+  dat = messaging.new_message('can', 1)
 
-    msg = dat.can[0]
-    msg.address = addr
-    msg.dat = " " * l
+  msg = dat.can[0]
+  msg.address = addr
+  msg.dat = " " * l
 
-    candidate_cars = eliminate_incompatible_cars(msg, candidate_cars)
-    print(candidate_cars)
+  candidate_cars = eliminate_incompatible_cars(msg, candidate_cars)
+  print(candidate_cars)

selfdrive/hardware/tici/hardware.py

@@ -24,19 +24,19 @@
 MM_SIM = MM + ".Sim"
 
 class MM_MODEM_STATE(IntEnum):
-       FAILED        = -1
-       UNKNOWN       = 0
-       INITIALIZING  = 1
-       LOCKED        = 2
-       DISABLED      = 3
-       DISABLING     = 4
-       ENABLING      = 5
-       ENABLED       = 6
-       SEARCHING     = 7
-       REGISTERED    = 8
-       DISCONNECTING = 9
-       CONNECTING    = 10
-       CONNECTED     = 11
+  FAILED        = -1
+  UNKNOWN       = 0
+  INITIALIZING  = 1
+  LOCKED        = 2
+  DISABLED      = 3
+  DISABLING     = 4
+  ENABLING      = 5
+  ENABLED       = 6
+  SEARCHING     = 7
+  REGISTERED    = 8
+  DISCONNECTING = 9
+  CONNECTING    = 10
+  CONNECTED     = 11
 
 class NMMetered(IntEnum):
   NM_METERED_UNKNOWN = 0
@@ -194,14 +194,14 @@ def get_network_info(self):
       return None
 
   def parse_strength(self, percentage):
-      if percentage < 25:
-        return NetworkStrength.poor
-      elif percentage < 50:
-        return NetworkStrength.moderate
-      elif percentage < 75:
-        return NetworkStrength.good
-      else:
-        return NetworkStrength.great
+    if percentage < 25:
+      return NetworkStrength.poor
+    elif percentage < 50:
+      return NetworkStrength.moderate
+    elif percentage < 75:
+      return NetworkStrength.good
+    else:
+      return NetworkStrength.great
 
   def get_network_strength(self, network_type):
     network_strength = NetworkStrength.unknown

selfdrive/locationd/models/loc_kf.py

@@ -474,14 +474,14 @@ def predict_and_update_odo_trans(self, trans, t, kind):
     z = trans[:, :3]
     R = np.zeros((len(trans), 3, 3))
     for i, _ in enumerate(z):
-        R[i, :, :] = np.diag(trans[i, 3:]**2)
+      R[i, :, :] = np.diag(trans[i, 3:]**2)
     return self.filter.predict_and_update_batch(t, kind, z, R)
 
   def predict_and_update_odo_rot(self, rot, t, kind):
     z = rot[:, :3]
     R = np.zeros((len(rot), 3, 3))
     for i, _ in enumerate(z):
-        R[i, :, :] = np.diag(rot[i, 3:]**2)
+      R[i, :, :] = np.diag(rot[i, 3:]**2)
     return self.filter.predict_and_update_batch(t, kind, z, R)
 
   def predict_and_update_orb_features(self, tracks, t, kind):
@@ -518,7 +518,7 @@ def predict_and_update_orb_features(self, tracks, t, kind):
 
     y_full = np.zeros((z.shape[0], z.shape[1] - 3))
     if sum(good_idxs) > 0:
-        y_full[good_idxs] = np.array(ret[6])
+      y_full[good_idxs] = np.array(ret[6])
     ret = ret[:6] + (y_full, z, ecef_pos)
     return ret
 

selfdrive/loggerd/tests/fill_eon.py

@@ -23,4 +23,4 @@
     # Fill up to 99 percent
     available_percent = get_available_percent()
     if available_percent < 1.0:
-        break
+      break

selfdrive/loggerd/tests/loggerd_tests_common.py

@@ -8,22 +8,22 @@
 import selfdrive.loggerd.uploader as uploader
 
 def create_random_file(file_path, size_mb, lock=False):
-    try:
-      os.mkdir(os.path.dirname(file_path))
-    except OSError:
-      pass
+  try:
+    os.mkdir(os.path.dirname(file_path))
+  except OSError:
+    pass
 
-    lock_path = file_path + ".lock"
-    if lock:
-      os.close(os.open(lock_path, os.O_CREAT | os.O_EXCL))
+  lock_path = file_path + ".lock"
+  if lock:
+    os.close(os.open(lock_path, os.O_CREAT | os.O_EXCL))
 
-    chunks = 128
-    chunk_bytes = int(size_mb * 1024 * 1024 / chunks)
-    data = os.urandom(chunk_bytes)
+  chunks = 128
+  chunk_bytes = int(size_mb * 1024 * 1024 / chunks)
+  data = os.urandom(chunk_bytes)
 
-    with open(file_path, 'wb') as f:
-      for _ in range(chunks):
-        f.write(data)
+  with open(file_path, 'wb') as f:
+    for _ in range(chunks):
+      f.write(data)
 
 class MockResponse():
   def __init__(self, text, status_code):

selfdrive/manager/process.py

@@ -199,7 +199,7 @@ def prepare(self) -> None:
   def start(self) -> None:
     # In case we only tried a non blocking stop we need to stop it before restarting
     if self.shutting_down:
-        self.stop()
+      self.stop()
 
     if self.proc is not None:
       return
@@ -231,7 +231,7 @@ def prepare(self) -> None:
   def start(self) -> None:
     # In case we only tried a non blocking stop we need to stop it before restarting
     if self.shutting_down:
-        self.stop()
+      self.stop()
 
     if self.proc is not None:
       return

selfdrive/monitoring/test_monitoring.py

@@ -136,21 +136,21 @@ def test_biggest_comma_fan(self):
   # engaged, invisible driver, down to orange, driver touches wheel; then down to orange again, driver appears
   #  - both actions should clear the alert, but momentary appearance should not
   def test_sometimes_transparent_commuter(self):
-      _visible_time = np.random.choice([0.5, 10])
-      ds_vector = always_no_face[:]*2
-      interaction_vector = always_false[:]*2
-      ds_vector[int((2*INVISIBLE_SECONDS_TO_ORANGE+1)/DT_DMON):int((2*INVISIBLE_SECONDS_TO_ORANGE+1+_visible_time)/DT_DMON)] = [msg_ATTENTIVE] * int(_visible_time/DT_DMON)
-      interaction_vector[int((INVISIBLE_SECONDS_TO_ORANGE)/DT_DMON):int((INVISIBLE_SECONDS_TO_ORANGE+1)/DT_DMON)] = [True] * int(1/DT_DMON)
-      events, _ = self._run_seq(ds_vector, interaction_vector, 2*always_true, 2*always_false)
-      self.assertTrue(len(events[int(INVISIBLE_SECONDS_TO_ORANGE*0.5/DT_DMON)]) == 0)
-      self.assertEqual(events[int((INVISIBLE_SECONDS_TO_ORANGE-0.1)/DT_DMON)].names[0], EventName.promptDriverUnresponsive)
-      self.assertTrue(len(events[int((INVISIBLE_SECONDS_TO_ORANGE+0.1)/DT_DMON)]) == 0)
-      if _visible_time == 0.5:
-        self.assertEqual(events[int((INVISIBLE_SECONDS_TO_ORANGE*2+1-0.1)/DT_DMON)].names[0], EventName.promptDriverUnresponsive)
-        self.assertEqual(events[int((INVISIBLE_SECONDS_TO_ORANGE*2+1+0.1+_visible_time)/DT_DMON)].names[0], EventName.preDriverUnresponsive)
-      elif _visible_time == 10:
-        self.assertEqual(events[int((INVISIBLE_SECONDS_TO_ORANGE*2+1-0.1)/DT_DMON)].names[0], EventName.promptDriverUnresponsive)
-        self.assertTrue(len(events[int((INVISIBLE_SECONDS_TO_ORANGE*2+1+0.1+_visible_time)/DT_DMON)]) == 0)
+    _visible_time = np.random.choice([0.5, 10])
+    ds_vector = always_no_face[:]*2
+    interaction_vector = always_false[:]*2
+    ds_vector[int((2*INVISIBLE_SECONDS_TO_ORANGE+1)/DT_DMON):int((2*INVISIBLE_SECONDS_TO_ORANGE+1+_visible_time)/DT_DMON)] = [msg_ATTENTIVE] * int(_visible_time/DT_DMON)
+    interaction_vector[int((INVISIBLE_SECONDS_TO_ORANGE)/DT_DMON):int((INVISIBLE_SECONDS_TO_ORANGE+1)/DT_DMON)] = [True] * int(1/DT_DMON)
+    events, _ = self._run_seq(ds_vector, interaction_vector, 2*always_true, 2*always_false)
+    self.assertTrue(len(events[int(INVISIBLE_SECONDS_TO_ORANGE*0.5/DT_DMON)]) == 0)
+    self.assertEqual(events[int((INVISIBLE_SECONDS_TO_ORANGE-0.1)/DT_DMON)].names[0], EventName.promptDriverUnresponsive)
+    self.assertTrue(len(events[int((INVISIBLE_SECONDS_TO_ORANGE+0.1)/DT_DMON)]) == 0)
+    if _visible_time == 0.5:
+      self.assertEqual(events[int((INVISIBLE_SECONDS_TO_ORANGE*2+1-0.1)/DT_DMON)].names[0], EventName.promptDriverUnresponsive)
+      self.assertEqual(events[int((INVISIBLE_SECONDS_TO_ORANGE*2+1+0.1+_visible_time)/DT_DMON)].names[0], EventName.preDriverUnresponsive)
+    elif _visible_time == 10:
+      self.assertEqual(events[int((INVISIBLE_SECONDS_TO_ORANGE*2+1-0.1)/DT_DMON)].names[0], EventName.promptDriverUnresponsive)
+      self.assertTrue(len(events[int((INVISIBLE_SECONDS_TO_ORANGE*2+1+0.1+_visible_time)/DT_DMON)]) == 0)
 
   # engaged, invisible driver, down to red, driver appears and then touches wheel, then disengages/reengages
   #  - only disengage will clear the alert

selfdrive/test/process_replay/compare_logs.py

@@ -25,7 +25,7 @@ def save_log(dest, log_msgs, compress=True):
     dat = bz2.compress(dat)
 
   with open(dest, "wb") as f:
-   f.write(dat)
+    f.write(dat)
 
 
 def remove_ignored_fields(msg, ignore):

selfdrive/test/process_replay/process_replay.py

@@ -231,7 +231,7 @@ def ublox_rcv_callback(msg):
   elif (msg_class, msg_id) in {(2, 1 * 16 + 5), (10, 9)}:
     return ["ubloxGnss"]
   else:
-     return []
+    return []
 
 
 CONFIGS = [

selfdrive/test/process_replay/regen.py

@@ -61,10 +61,10 @@ def replay_manager_state(s, msgs):
   rk = Ratekeeper(service_list[s].frequency, print_delay_threshold=None)
 
   while True:
-      new_m = messaging.new_message('managerState')
-      new_m.managerState.processes = [{'name': name, 'running': True} for name in managed_processes]
-      pm.send(s, new_m)
-      rk.keep_time()
+    new_m = messaging.new_message('managerState')
+    new_m.managerState.processes = [{'name': name, 'running': True} for name in managed_processes]
+    pm.send(s, new_m)
+    rk.keep_time()
 
 
 def replay_device_state(s, msgs):

selfdrive/tombstoned.py

@@ -153,9 +153,9 @@ def report_tombstone_apport(fn):
     # Try to find first entry in openpilot, fall back to first line
     for line in stacktrace_s:
       if "at selfdrive/" in line:
-          crash_function = line
-          found = True
-          break
+        crash_function = line
+        found = True
+        break
 
     if not found:
       crash_function = stacktrace_s[1]