Use set & dict literals (#33636)

Co-authored-by: Daniel Høyer Iversen <mail@dahoiv.net>

homeassistant/bootstrap.py

@@ -309,7 +309,7 @@ async def async_mount_local_lib_path(config_dir: str) -> str:
 def _get_domains(hass: core.HomeAssistant, config: Dict[str, Any]) -> Set[str]:
     """Get domains of components to set up."""
     # Filter out the repeating and common config section [homeassistant]
-    domains = set(key.split(" ")[0] for key in config.keys() if key != core.DOMAIN)
+    domains = {key.split(" ")[0] for key in config.keys() if key != core.DOMAIN}
 
     # Add config entry domains
     if not hass.config.safe_mode:

homeassistant/components/august/__init__.py

@@ -214,11 +214,11 @@ class AugustData(AugustSubscriberMixin):
             await self._api.async_get_doorbells(self._august_gateway.access_token) or []
         )
 
-        self._doorbells_by_id = dict((device.device_id, device) for device in doorbells)
+        self._doorbells_by_id = {device.device_id: device for device in doorbells}
-        self._locks_by_id = dict((device.device_id, device) for device in locks)
+        self._locks_by_id = {device.device_id: device for device in locks}
-        self._house_ids = set(
+        self._house_ids = {
             device.house_id for device in itertools.chain(locks, doorbells)
-        )
+        }
 
         await self._async_refresh_device_detail_by_ids(
             [device.device_id for device in itertools.chain(locks, doorbells)]

homeassistant/components/bayesian/binary_sensor.py

@@ -303,11 +303,11 @@ class BayesianBinarySensor(BinarySensorDevice):
         return {
             ATTR_OBSERVATIONS: list(self.current_observations.values()),
             ATTR_OCCURRED_OBSERVATION_ENTITIES: list(
-                set(
+                {
                     obs.get("entity_id")
                     for obs in self.current_observations.values()
                     if obs is not None
-                )
+                }
             ),
             ATTR_PROBABILITY: round(self.probability, 2),
             ATTR_PROBABILITY_THRESHOLD: self._probability_threshold,

homeassistant/components/bme680/sensor.py

@@ -61,8 +61,8 @@ SENSOR_TYPES = {
     SENSOR_AQ: ["Air Quality", UNIT_PERCENTAGE],
 }
 DEFAULT_MONITORED = [SENSOR_TEMP, SENSOR_HUMID, SENSOR_PRESS, SENSOR_AQ]
-OVERSAMPLING_VALUES = set([0, 1, 2, 4, 8, 16])
+OVERSAMPLING_VALUES = {0, 1, 2, 4, 8, 16}
-FILTER_VALUES = set([0, 1, 3, 7, 15, 31, 63, 127])
+FILTER_VALUES = {0, 1, 3, 7, 15, 31, 63, 127}
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {

homeassistant/components/cast/discovery.py

@@ -30,9 +30,9 @@ def discover_chromecast(hass: HomeAssistant, info: ChromecastInfo):
 
     if info.uuid is not None:
         # Remove previous cast infos with same uuid from known chromecasts.
-        same_uuid = set(
+        same_uuid = {
             x for x in hass.data[KNOWN_CHROMECAST_INFO_KEY] if info.uuid == x.uuid
-        )
+        }
         hass.data[KNOWN_CHROMECAST_INFO_KEY] -= same_uuid
 
     hass.data[KNOWN_CHROMECAST_INFO_KEY].add(info)

homeassistant/components/emulated_roku/config_flow.py

@@ -11,9 +11,9 @@ from .const import CONF_LISTEN_PORT, DEFAULT_NAME, DEFAULT_PORT, DOMAIN
 @callback
 def configured_servers(hass):
     """Return a set of the configured servers."""
-    return set(
+    return {
         entry.data[CONF_NAME] for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 @config_entries.HANDLERS.register(DOMAIN)

homeassistant/components/geonetnz_volcano/config_flow.py

@@ -24,10 +24,10 @@ _LOGGER = logging.getLogger(__name__)
 @callback
 def configured_instances(hass):
     """Return a set of configured GeoNet NZ Volcano instances."""
-    return set(
+    return {
         f"{entry.data[CONF_LATITUDE]}, {entry.data[CONF_LONGITUDE]}"
         for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 class GeonetnzVolcanoFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):

homeassistant/components/google_assistant/smart_home.py

@@ -262,7 +262,7 @@ async def async_devices_reachable(hass, data: RequestData, payload):
 
     https://developers.google.com/actions/smarthome/create#actiondevicesdisconnect
     """
-    google_ids = set(dev["id"] for dev in (data.devices or []))
+    google_ids = {dev["id"] for dev in (data.devices or [])}
 
     return {
         "devices": [

homeassistant/components/gtfs/sensor.py

@@ -659,9 +659,9 @@ class GTFSDepartureSensor(Entity):
     @staticmethod
     def dict_for_table(resource: Any) -> dict:
         """Return a dictionary for the SQLAlchemy resource given."""
-        return dict(
+        return {
-            (col, getattr(resource, col)) for col in resource.__table__.columns.keys()
+            col: getattr(resource, col) for col in resource.__table__.columns.keys()
-        )
+        }
 
     def append_keys(self, resource: dict, prefix: Optional[str] = None) -> None:
         """Properly format key val pairs to append to attributes."""

homeassistant/components/homematicip_cloud/__init__.py

@@ -50,10 +50,10 @@ async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
     accesspoints = config.get(DOMAIN, [])
 
     for conf in accesspoints:
-        if conf[CONF_ACCESSPOINT] not in set(
+        if conf[CONF_ACCESSPOINT] not in {
             entry.data[HMIPC_HAPID]
             for entry in hass.config_entries.async_entries(DOMAIN)
-        ):
+        }:
             hass.async_add_job(
                 hass.config_entries.flow.async_init(
                     DOMAIN,

homeassistant/components/hue/__init__.py

@@ -70,9 +70,9 @@ async def async_setup(hass, config):
 
     bridges = conf[CONF_BRIDGES]
 
-    configured_hosts = set(
+    configured_hosts = {
         entry.data.get("host") for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
     for bridge_conf in bridges:
         host = bridge_conf[CONF_HOST]

homeassistant/components/iqvia/config_flow.py

@@ -16,9 +16,9 @@ from .const import CONF_ZIP_CODE, DOMAIN
 @callback
 def configured_instances(hass):
     """Return a set of configured IQVIA instances."""
-    return set(
+    return {
         entry.data[CONF_ZIP_CODE] for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 @config_entries.HANDLERS.register(DOMAIN)

homeassistant/components/luftdaten/config_flow.py

@@ -22,10 +22,10 @@ from .const import CONF_SENSOR_ID, DEFAULT_SCAN_INTERVAL, DOMAIN
 @callback
 def configured_sensors(hass):
     """Return a set of configured Luftdaten sensors."""
-    return set(
+    return {
         entry.data[CONF_SENSOR_ID]
         for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 @callback

homeassistant/components/mold_indicator/sensor.py

@@ -90,13 +90,11 @@ class MoldIndicator(Entity):
         self._calib_factor = calib_factor
         self._is_metric = is_metric
         self._available = False
-        self._entities = set(
+        self._entities = {
-            [
+            self._indoor_temp_sensor,
-                self._indoor_temp_sensor,
+            self._indoor_humidity_sensor,
-                self._indoor_humidity_sensor,
+            self._outdoor_temp_sensor,
-                self._outdoor_temp_sensor,
+        }
-            ]
-        )
 
         self._dewpoint = None
         self._indoor_temp = None

homeassistant/components/openuv/config_flow.py

@@ -19,13 +19,13 @@ from .const import DOMAIN
 @callback
 def configured_instances(hass):
     """Return a set of configured OpenUV instances."""
-    return set(
+    return {
         "{}, {}".format(
             entry.data.get(CONF_LATITUDE, hass.config.latitude),
             entry.data.get(CONF_LONGITUDE, hass.config.longitude),
         )
         for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 @config_entries.HANDLERS.register(DOMAIN)

homeassistant/components/pioneer/media_player.py

@@ -87,7 +87,7 @@ class PioneerDevice(MediaPlayerDevice):
         self._muted = False
         self._selected_source = ""
         self._source_name_to_number = sources
-        self._source_number_to_name = dict((v, k) for k, v in sources.items())
+        self._source_number_to_name = {v: k for k, v in sources.items()}
 
     @classmethod
     def telnet_request(cls, telnet, command, expected_prefix):

homeassistant/components/plex/config_flow.py

@@ -43,10 +43,10 @@ _LOGGER = logging.getLogger(__package__)
 @callback
 def configured_servers(hass):
     """Return a set of the configured Plex servers."""
-    return set(
+    return {
         entry.data[CONF_SERVER_IDENTIFIER]
         for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 class PlexFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):

homeassistant/components/python_script/__init__.py

@@ -32,30 +32,41 @@ FOLDER = "python_scripts"
 
 CONFIG_SCHEMA = vol.Schema({DOMAIN: vol.Schema(dict)}, extra=vol.ALLOW_EXTRA)
 
-ALLOWED_HASS = set(["bus", "services", "states"])
+ALLOWED_HASS = {"bus", "services", "states"}
-ALLOWED_EVENTBUS = set(["fire"])
+ALLOWED_EVENTBUS = {"fire"}
-ALLOWED_STATEMACHINE = set(
+ALLOWED_STATEMACHINE = {
-    ["entity_ids", "all", "get", "is_state", "is_state_attr", "remove", "set"]
+    "entity_ids",
-)
+    "all",
-ALLOWED_SERVICEREGISTRY = set(["services", "has_service", "call"])
+    "get",
-ALLOWED_TIME = set(
+    "is_state",
-    ["sleep", "strftime", "strptime", "gmtime", "localtime", "ctime", "time", "mktime"]
+    "is_state_attr",
-)
+    "remove",
-ALLOWED_DATETIME = set(["date", "time", "datetime", "timedelta", "tzinfo"])
+    "set",
-ALLOWED_DT_UTIL = set(
+}
-    [
+ALLOWED_SERVICEREGISTRY = {"services", "has_service", "call"}
-        "utcnow",
+ALLOWED_TIME = {
-        "now",
+    "sleep",
-        "as_utc",
+    "strftime",
-        "as_timestamp",
+    "strptime",
-        "as_local",
+    "gmtime",
-        "utc_from_timestamp",
+    "localtime",
-        "start_of_local_day",
+    "ctime",
-        "parse_datetime",
+    "time",
-        "parse_date",
+    "mktime",
-        "get_age",
+}
-    ]
+ALLOWED_DATETIME = {"date", "time", "datetime", "timedelta", "tzinfo"}
-)
+ALLOWED_DT_UTIL = {
+    "utcnow",
+    "now",
+    "as_utc",
+    "as_timestamp",
+    "as_local",
+    "utc_from_timestamp",
+    "start_of_local_day",
+    "parse_datetime",
+    "parse_date",
+    "get_age",
+}
 
 
 class ScriptError(HomeAssistantError):

homeassistant/components/smhi/config_flow.py

@@ -15,10 +15,10 @@ from .const import DOMAIN, HOME_LOCATION_NAME
 @callback
 def smhi_locations(hass: HomeAssistant):
     """Return configurations of SMHI component."""
-    return set(
+    return {
         (slugify(entry.data[CONF_NAME]))
         for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 @config_entries.HANDLERS.register(DOMAIN)

homeassistant/components/solaredge/config_flow.py

@@ -14,10 +14,10 @@ from .const import CONF_SITE_ID, DEFAULT_NAME, DOMAIN
 @callback
 def solaredge_entries(hass: HomeAssistant):
     """Return the site_ids for the domain."""
-    return set(
+    return {
         (entry.data[CONF_SITE_ID])
         for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 class SolarEdgeConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):

homeassistant/components/solarlog/config_flow.py

@@ -19,9 +19,9 @@ _LOGGER = logging.getLogger(__name__)
 @callback
 def solarlog_entries(hass: HomeAssistant):
     """Return the hosts already configured."""
-    return set(
+    return {
         entry.data[CONF_HOST] for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 class SolarLogConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):

homeassistant/components/sonos/media_player.py

@@ -1109,7 +1109,7 @@ class SonosEntity(MediaPlayerDevice):
                 entity.restore()
 
         # Find all affected players
-        entities = set(e for e in entities if e._soco_snapshot)
+        entities = {e for e in entities if e._soco_snapshot}
         if with_group:
             for entity in [e for e in entities if e._snapshot_group]:
                 entities.update(entity._snapshot_group)

homeassistant/components/tesla/config_flow.py

@@ -33,7 +33,7 @@ DATA_SCHEMA = vol.Schema(
 @callback
 def configured_instances(hass):
     """Return a set of configured Tesla instances."""
-    return set(entry.title for entry in hass.config_entries.async_entries(DOMAIN))
+    return {entry.title for entry in hass.config_entries.async_entries(DOMAIN)}
 
 
 class TeslaConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):

homeassistant/components/toon/config_flow.py

@@ -31,9 +31,9 @@ _LOGGER = logging.getLogger(__name__)
 @callback
 def configured_displays(hass):
     """Return a set of configured Toon displays."""
-    return set(
+    return {
         entry.data[CONF_DISPLAY] for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 @config_entries.HANDLERS.register(DOMAIN)

homeassistant/components/velbus/config_flow.py

@@ -13,9 +13,9 @@ from .const import DOMAIN
 @callback
 def velbus_entries(hass: HomeAssistant):
     """Return connections for Velbus domain."""
-    return set(
+    return {
         (entry.data[CONF_PORT]) for entry in hass.config_entries.async_entries(DOMAIN)
-    )
+    }
 
 
 class VelbusConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):

homeassistant/config_entries.py

@@ -870,11 +870,11 @@ class ConfigFlow(data_entry_flow.FlowHandler):
     def _async_current_ids(self, include_ignore: bool = True) -> Set[Optional[str]]:
         """Return current unique IDs."""
         assert self.hass is not None
-        return set(
+        return {
             entry.unique_id
             for entry in self.hass.config_entries.async_entries(self.handler)
             if include_ignore or entry.source != SOURCE_IGNORE
-        )
+        }
 
     @callback
     def _async_in_progress(self) -> List[Dict]:

homeassistant/helpers/check_config.py

@@ -107,7 +107,7 @@ async def async_check_ha_config_file(hass: HomeAssistant) -> HomeAssistantConfig
     core_config.pop(CONF_PACKAGES, None)
 
     # Filter out repeating config sections
-    components = set(key.split(" ")[0] for key in config.keys())
+    components = {key.split(" ")[0] for key in config.keys()}
 
     # Process and validate config
     for domain in components:

homeassistant/helpers/restore_state.py

@@ -123,11 +123,11 @@ class RestoreStateData:
         now = dt_util.utcnow()
         all_states = self.hass.states.async_all()
         # Entities currently backed by an entity object
-        current_entity_ids = set(
+        current_entity_ids = {
             state.entity_id
             for state in all_states
             if not state.attributes.get(entity_registry.ATTR_RESTORED)
-        )
+        }
 
         # Start with the currently registered states
         stored_states = [