[ruff] Enable PERF rules and fix all violations (#9874)

esphome/__main__.py

@@ -89,9 +89,9 @@ def choose_prompt(options, purpose: str = None):
 def choose_upload_log_host(
     default, check_default, show_ota, show_mqtt, show_api, purpose: str = None
 ):
-    options = []
+    options = [
-    for port in get_serial_ports():
+        (f"{port.path} ({port.description})", port.path) for port in get_serial_ports()
-        options.append((f"{port.path} ({port.description})", port.path))
+    ]
     if default == "SERIAL":
         return choose_prompt(options, purpose=purpose)
     if (show_ota and "ota" in CORE.config) or (show_api and "api" in CORE.config):

esphome/components/binary_sensor/__init__.py

@@ -266,8 +266,10 @@ async def delayed_off_filter_to_code(config, filter_id):
 async def autorepeat_filter_to_code(config, filter_id):
     timings = []
     if len(config) > 0:
-        for conf in config:
+        timings.extend(
-            timings.append((conf[CONF_DELAY], conf[CONF_TIME_OFF], conf[CONF_TIME_ON]))
+            (conf[CONF_DELAY], conf[CONF_TIME_OFF], conf[CONF_TIME_ON])
+            for conf in config
+        )
     else:
         timings.append(
             (
@@ -573,16 +575,15 @@ async def setup_binary_sensor_core_(var, config):
         await automation.build_automation(trigger, [], conf)
 
     for conf in config.get(CONF_ON_MULTI_CLICK, []):
-        timings = []
+        timings = [
-        for tim in conf[CONF_TIMING]:
+            cg.StructInitializer(
-            timings.append(
+                MultiClickTriggerEvent,
-                cg.StructInitializer(
+                ("state", tim[CONF_STATE]),
-                    MultiClickTriggerEvent,
+                ("min_length", tim[CONF_MIN_LENGTH]),
-                    ("state", tim[CONF_STATE]),
+                ("max_length", tim.get(CONF_MAX_LENGTH, 4294967294)),
-                    ("min_length", tim[CONF_MIN_LENGTH]),
-                    ("max_length", tim.get(CONF_MAX_LENGTH, 4294967294)),
-                )
             )
+            for tim in conf[CONF_TIMING]
+        ]
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var, timings)
         if CONF_INVALID_COOLDOWN in conf:
             cg.add(trigger.set_invalid_cooldown(conf[CONF_INVALID_COOLDOWN]))

esphome/components/dfrobot_sen0395/__init__.py

@@ -74,8 +74,7 @@ def range_segment_list(input):
     if isinstance(input, list):
         for list_item in input:
             if isinstance(list_item, list):
-                for item in list_item:
+                flat_list.extend(list_item)
-                    flat_list.append(item)
             else:
                 flat_list.append(list_item)
     else:

esphome/components/esp32/__init__.py

@@ -982,7 +982,7 @@ def copy_files():
             __version__,
         )
 
-    for _, file in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES].items():
+    for file in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES].values():
         if file[KEY_PATH].startswith("http"):
             import requests
 

esphome/components/esp32_ble_tracker/__init__.py

@@ -310,9 +310,7 @@ async def to_code(config):
     for conf in config.get(CONF_ON_BLE_ADVERTISE, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         if CONF_MAC_ADDRESS in conf:
-            addr_list = []
+            addr_list = [it.as_hex for it in conf[CONF_MAC_ADDRESS]]
-            for it in conf[CONF_MAC_ADDRESS]:
-                addr_list.append(it.as_hex)
             cg.add(trigger.set_addresses(addr_list))
         await automation.build_automation(trigger, [(ESPBTDeviceConstRef, "x")], conf)
     for conf in config.get(CONF_ON_BLE_SERVICE_DATA_ADVERTISE, []):

esphome/components/esphome/ota/__init__.py

@@ -73,8 +73,7 @@ def ota_esphome_final_validate(config):
         else:
             new_ota_conf.append(ota_conf)
 
-    for port_conf in merged_ota_esphome_configs_by_port.values():
+    new_ota_conf.extend(merged_ota_esphome_configs_by_port.values())
-        new_ota_conf.append(port_conf)
 
     full_conf[CONF_OTA] = new_ota_conf
     fv.full_config.set(full_conf)

esphome/components/lcd_gpio/display.py

@@ -41,9 +41,7 @@ CONFIG_SCHEMA = lcd_base.LCD_SCHEMA.extend(
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await lcd_base.setup_lcd_display(var, config)
-    pins_ = []
+    pins_ = [await cg.gpio_pin_expression(conf) for conf in config[CONF_DATA_PINS]]
-    for conf in config[CONF_DATA_PINS]:
-        pins_.append(await cg.gpio_pin_expression(conf))
     cg.add(var.set_data_pins(*pins_))
     enable = await cg.gpio_pin_expression(config[CONF_ENABLE_PIN])
     cg.add(var.set_enable_pin(enable))

esphome/components/light/effects.py

@@ -291,31 +291,30 @@ async def random_effect_to_code(config, effect_id):
 )
 async def strobe_effect_to_code(config, effect_id):
     var = cg.new_Pvariable(effect_id, config[CONF_NAME])
-    colors = []
+    colors = [
-    for color in config.get(CONF_COLORS, []):
+        cg.StructInitializer(
-        colors.append(
+            StrobeLightEffectColor,
-            cg.StructInitializer(
+            (
-                StrobeLightEffectColor,
+                "color",
-                (
+                LightColorValues(
-                    "color",
+                    color.get(CONF_COLOR_MODE, ColorMode.UNKNOWN),
-                    LightColorValues(
+                    color[CONF_STATE],
-                        color.get(CONF_COLOR_MODE, ColorMode.UNKNOWN),
+                    color[CONF_BRIGHTNESS],
-                        color[CONF_STATE],
+                    color[CONF_COLOR_BRIGHTNESS],
-                        color[CONF_BRIGHTNESS],
+                    color[CONF_RED],
-                        color[CONF_COLOR_BRIGHTNESS],
+                    color[CONF_GREEN],
-                        color[CONF_RED],
+                    color[CONF_BLUE],
-                        color[CONF_GREEN],
+                    color[CONF_WHITE],
-                        color[CONF_BLUE],
+                    color.get(CONF_COLOR_TEMPERATURE, 0.0),
-                        color[CONF_WHITE],
+                    color[CONF_COLD_WHITE],
-                        color.get(CONF_COLOR_TEMPERATURE, 0.0),
+                    color[CONF_WARM_WHITE],
-                        color[CONF_COLD_WHITE],
-                        color[CONF_WARM_WHITE],
-                    ),
                 ),
-                ("duration", color[CONF_DURATION]),
+            ),
-                ("transition_length", color[CONF_TRANSITION_LENGTH]),
+            ("duration", color[CONF_DURATION]),
-            )
+            ("transition_length", color[CONF_TRANSITION_LENGTH]),
         )
+        for color in config.get(CONF_COLORS, [])
+    ]
     cg.add(var.set_colors(colors))
     return var
 
@@ -404,20 +403,19 @@ async def addressable_color_wipe_effect_to_code(config, effect_id):
     var = cg.new_Pvariable(effect_id, config[CONF_NAME])
     cg.add(var.set_add_led_interval(config[CONF_ADD_LED_INTERVAL]))
     cg.add(var.set_reverse(config[CONF_REVERSE]))
-    colors = []
+    colors = [
-    for color in config.get(CONF_COLORS, []):
+        cg.StructInitializer(
-        colors.append(
+            AddressableColorWipeEffectColor,
-            cg.StructInitializer(
+            ("r", int(round(color[CONF_RED] * 255))),
-                AddressableColorWipeEffectColor,
+            ("g", int(round(color[CONF_GREEN] * 255))),
-                ("r", int(round(color[CONF_RED] * 255))),
+            ("b", int(round(color[CONF_BLUE] * 255))),
-                ("g", int(round(color[CONF_GREEN] * 255))),
+            ("w", int(round(color[CONF_WHITE] * 255))),
-                ("b", int(round(color[CONF_BLUE] * 255))),
+            ("random", color[CONF_RANDOM]),
-                ("w", int(round(color[CONF_WHITE] * 255))),
+            ("num_leds", color[CONF_NUM_LEDS]),
-                ("random", color[CONF_RANDOM]),
+            ("gradient", color[CONF_GRADIENT]),
-                ("num_leds", color[CONF_NUM_LEDS]),
-                ("gradient", color[CONF_GRADIENT]),
-            )
         )
+        for color in config.get(CONF_COLORS, [])
+    ]
     cg.add(var.set_colors(colors))
     return var
 

esphome/components/pipsolar/sensor/__init__.py

@@ -273,7 +273,7 @@ CONFIG_SCHEMA = PIPSOLAR_COMPONENT_SCHEMA.extend(
 async def to_code(config):
     paren = await cg.get_variable(config[CONF_PIPSOLAR_ID])
 
-    for type, _ in TYPES.items():
+    for type in TYPES:
         if type in config:
             conf = config[type]
             sens = await sensor.new_sensor(conf)

esphome/core/config.py

@@ -317,7 +317,7 @@ def preload_core_config(config, result) -> str:
 
     target_platforms = []
 
-    for domain, _ in config.items():
+    for domain in config:
         if domain.startswith("."):
             continue
         if _is_target_platform(domain):

esphome/dashboard/web_server.py

@@ -144,7 +144,7 @@ def websocket_class(cls):
     if not hasattr(cls, "_message_handlers"):
         cls._message_handlers = {}
 
-    for _, method in cls.__dict__.items():
+    for method in cls.__dict__.values():
         if hasattr(method, "_message_handler"):
             cls._message_handlers[method._message_handler] = method
 

pyproject.toml

@@ -111,12 +111,13 @@ exclude = ['generated']
 
 [tool.ruff.lint]
 select = [
-  "E",   # pycodestyle
+  "E",    # pycodestyle
-  "F",   # pyflakes/autoflake
+  "F",    # pyflakes/autoflake
-  "I",   # isort
+  "I",    # isort
-  "PL",  # pylint
+  "PERF", # performance
-  "SIM", # flake8-simplify
+  "PL",   # pylint
-  "UP",  # pyupgrade
+  "SIM",  # flake8-simplify
+  "UP",   # pyupgrade
 ]
 
 ignore = [

script/clang-format

@@ -66,9 +66,10 @@ def main():
     )
     args = parser.parse_args()
 
-    files = []
+    cwd = os.getcwd()
-    for path in git_ls_files(["*.cpp", "*.h", "*.tcc"]):
+    files = [
-        files.append(os.path.relpath(path, os.getcwd()))
+        os.path.relpath(path, cwd) for path in git_ls_files(["*.cpp", "*.h", "*.tcc"])
+    ]
 
     if args.files:
         # Match against files specified on command-line

script/clang-tidy

@@ -219,9 +219,8 @@ def main():
     )
     args = parser.parse_args()
 
-    files = []
+    cwd = os.getcwd()
-    for path in git_ls_files(["*.cpp"]):
+    files = [os.path.relpath(path, cwd) for path in git_ls_files(["*.cpp"])]
-        files.append(os.path.relpath(path, os.getcwd()))
 
     # Print initial file count if it's large
     if len(files) > 50:

script/helpers_zephyr.py

@@ -41,11 +41,12 @@ CONFIG_NEWLIB_LIBC=y
         return include_paths
 
     def extract_defines(command):
-        defines = []
         define_pattern = re.compile(r"-D\s*([^\s]+)")
-        for match in define_pattern.findall(command):
+        defines = [
-            if match not in ("_ASMLANGUAGE"):
+            match
-                defines.append(match)
+            for match in define_pattern.findall(command)
+            if match not in ("_ASMLANGUAGE")
+        ]
         return defines
 
     def find_cxx_path(commands):
@@ -78,13 +79,14 @@ CONFIG_NEWLIB_LIBC=y
         return include_paths
 
     def extract_cxx_flags(command):
-        flags = []
         # Extracts CXXFLAGS from the command string, excluding includes and defines.
         flag_pattern = re.compile(
             r"(-O[0-3s]|-g|-std=[^\s]+|-Wall|-Wextra|-Werror|--[^\s]+|-f[^\s]+|-m[^\s]+|-imacros\s*[^\s]+)"
         )
-        for match in flag_pattern.findall(command):
+        flags = [
-            flags.append(match.replace("-imacros ", "-imacros"))
+            match.replace("-imacros ", "-imacros")
+            for match in flag_pattern.findall(command)
+        ]
         return flags
 
     def transform_to_idedata_format(compile_commands):

tests/integration/test_duplicate_entities.py

@@ -38,8 +38,7 @@ async def test_duplicate_entities_on_different_devices(
         # Get entity list
         entities = await client.list_entities_services()
         all_entities: list[EntityInfo] = []
-        for entity_list in entities[0]:
+        all_entities.extend(entities[0])
-            all_entities.append(entity_list)
 
         # Group entities by type for easier testing
         sensors = [e for e in all_entities if e.__class__.__name__ == "SensorInfo"]

tests/integration/test_host_mode_fan_preset.py

@@ -23,9 +23,7 @@ async def test_host_mode_fan_preset(
         entities = await client.list_entities_services()
         fans: list[FanInfo] = []
         for entity_list in entities:
-            for entity in entity_list:
+            fans.extend(entity for entity in entity_list if isinstance(entity, FanInfo))
-                if isinstance(entity, FanInfo):
-                    fans.append(entity)
 
         # Create a map of fan names to entity info
         fan_map = {fan.name: fan for fan in fans}

tests/unit_tests/test_substitutions.py

@@ -31,10 +31,8 @@ def dict_diff(a, b, path=""):
     if isinstance(a, dict) and isinstance(b, dict):
         a_keys = set(a)
         b_keys = set(b)
-        for key in a_keys - b_keys:
+        diffs.extend(f"{path}/{key} only in actual" for key in a_keys - b_keys)
-            diffs.append(f"{path}/{key} only in actual")
+        diffs.extend(f"{path}/{key} only in expected" for key in b_keys - a_keys)
-        for key in b_keys - a_keys:
-            diffs.append(f"{path}/{key} only in expected")
         for key in a_keys & b_keys:
             diffs.extend(dict_diff(a[key], b[key], f"{path}/{key}"))
     elif isinstance(a, list) and isinstance(b, list):
@@ -42,11 +40,14 @@ def dict_diff(a, b, path=""):
         for i in range(min_len):
             diffs.extend(dict_diff(a[i], b[i], f"{path}[{i}]"))
         if len(a) > len(b):
-            for i in range(min_len, len(a)):
+            diffs.extend(
-                diffs.append(f"{path}[{i}] only in actual: {a[i]!r}")
+                f"{path}[{i}] only in actual: {a[i]!r}" for i in range(min_len, len(a))
+            )
         elif len(b) > len(a):
-            for i in range(min_len, len(b)):
+            diffs.extend(
-                diffs.append(f"{path}[{i}] only in expected: {b[i]!r}")
+                f"{path}[{i}] only in expected: {b[i]!r}"
+                for i in range(min_len, len(b))
+            )
     elif a != b:
         diffs.append(f"\t{path}: actual={a!r} expected={b!r}")
     return diffs