cleanup iterate keys in dictionaries (#23497)

old-commit-hash: a186bcc9f1
commatwo_master
Dean Lee 3 years ago committed by GitHub
parent 5aa495c85f
commit 54bdb321bd
  1. 2
      selfdrive/car/car_helpers.py
  2. 2
      selfdrive/controls/controlsd.py
  3. 2
      selfdrive/controls/lib/events.py
  4. 6
      selfdrive/statsd.py

@ -125,7 +125,7 @@ def fingerprint(logcan, sendcan):
# The fingerprint dict is generated for all buses, this way the car interface # The fingerprint dict is generated for all buses, this way the car interface
# can use it to detect a (valid) multipanda setup and initialize accordingly # can use it to detect a (valid) multipanda setup and initialize accordingly
if can.src < 128: if can.src < 128:
if can.src not in finger.keys(): if can.src not in finger:
finger[can.src] = {} finger[can.src] = {}
finger[can.src][can.address] = len(can.dat) finger[can.src][can.address] = len(can.dat)

@ -563,7 +563,7 @@ class Controls:
def update_button_timers(self, buttonEvents): def update_button_timers(self, buttonEvents):
# increment timer for buttons still pressed # increment timer for buttons still pressed
for k in self.button_timers.keys(): for k in self.button_timers:
if self.button_timers[k] > 0: if self.button_timers[k] > 0:
self.button_timers[k] += 1 self.button_timers[k] += 1

@ -93,7 +93,7 @@ class Events:
for event_name in self.events: for event_name in self.events:
event = car.CarEvent.new_message() event = car.CarEvent.new_message()
event.name = event_name event.name = event_name
for event_type in EVENTS.get(event_name, {}).keys(): for event_type in EVENTS.get(event_name, {}):
setattr(event, event_type, True) setattr(event, event_type, True)
ret.append(event) ret.append(event)
return ret return ret

@ -44,8 +44,8 @@ class StatLog:
def main(): def main():
def get_influxdb_line(measurement: str, value: float, timestamp: datetime, tags: dict): def get_influxdb_line(measurement: str, value: float, timestamp: datetime, tags: dict):
res = f"{measurement}" res = f"{measurement}"
for tag_key in tags.keys(): for k, v in tags.items():
res += f",{tag_key}={str(tags[tag_key])}" res += f",{k}={str(v)}"
res += f" value={value} {int(timestamp.timestamp() * 1e9)}\n" res += f" value={value} {int(timestamp.timestamp() * 1e9)}\n"
return res return res
@ -101,7 +101,7 @@ def main():
current_time = datetime.utcnow().replace(tzinfo=timezone.utc) current_time = datetime.utcnow().replace(tzinfo=timezone.utc)
tags['started'] = sm['deviceState'].started tags['started'] = sm['deviceState'].started
for gauge_key in gauges.keys(): for gauge_key in gauges:
result += get_influxdb_line(f"gauge.{gauge_key}", gauges[gauge_key], current_time, tags) result += get_influxdb_line(f"gauge.{gauge_key}", gauges[gauge_key], current_time, tags)
# clear intermediate data # clear intermediate data

Loading…
Cancel
Save