From 0d95eff21d58530b1f15c9ce3023344952eaa86f Mon Sep 17 00:00:00 2001 From: springstan <46536646+springstan@users.noreply.github.com> Date: Sat, 4 Apr 2020 22:31:56 +0200 Subject: [PATCH] Use dict literals (#33658) --- homeassistant/components/androidtv/media_player.py | 4 ++-- homeassistant/components/config/scene.py | 2 +- homeassistant/components/device_tracker/setup.py | 2 +- homeassistant/components/dht/sensor.py | 2 +- homeassistant/components/ecobee/weather.py | 2 +- homeassistant/components/emulated_hue/__init__.py | 2 +- homeassistant/components/fail2ban/sensor.py | 2 +- homeassistant/components/ifttt/__init__.py | 2 +- homeassistant/components/kodi/media_player.py | 2 +- homeassistant/components/meteo_france/weather.py | 2 +- homeassistant/components/mhz19/sensor.py | 2 +- homeassistant/components/mpchc/media_player.py | 4 ++-- homeassistant/components/nanoleaf/light.py | 2 +- homeassistant/components/plant/__init__.py | 8 ++++---- homeassistant/components/remember_the_milk/__init__.py | 8 ++++---- homeassistant/components/stt/__init__.py | 2 +- homeassistant/components/ted5000/sensor.py | 2 +- homeassistant/components/template/__init__.py | 4 ++-- homeassistant/components/ubus/device_tracker.py | 6 +++--- homeassistant/components/volumio/media_player.py | 2 +- tests/components/google_wifi/test_sensor.py | 2 +- tests/components/template/test_cover.py | 2 +- 22 files changed, 33 insertions(+), 33 deletions(-) diff --git a/homeassistant/components/androidtv/media_player.py b/homeassistant/components/androidtv/media_player.py index f9ec68c8742..f78d88ab3ec 100644 --- a/homeassistant/components/androidtv/media_player.py +++ b/homeassistant/components/androidtv/media_player.py @@ -137,7 +137,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( vol.Optional(CONF_ADB_SERVER_IP): cv.string, vol.Optional(CONF_ADB_SERVER_PORT, default=DEFAULT_ADB_SERVER_PORT): cv.port, vol.Optional(CONF_GET_SOURCES, default=DEFAULT_GET_SOURCES): cv.boolean, - vol.Optional(CONF_APPS, default=dict()): vol.Schema( + vol.Optional(CONF_APPS, default={}): vol.Schema( {cv.string: vol.Any(cv.string, None)} ), vol.Optional(CONF_TURN_ON_COMMAND): cv.string, @@ -327,7 +327,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None): target_device.adb_push(local_path, device_path) hass.services.register( - ANDROIDTV_DOMAIN, SERVICE_UPLOAD, service_upload, schema=SERVICE_UPLOAD_SCHEMA, + ANDROIDTV_DOMAIN, SERVICE_UPLOAD, service_upload, schema=SERVICE_UPLOAD_SCHEMA ) diff --git a/homeassistant/components/config/scene.py b/homeassistant/components/config/scene.py index b380656c541..19cfb7cd31a 100644 --- a/homeassistant/components/config/scene.py +++ b/homeassistant/components/config/scene.py @@ -58,7 +58,7 @@ class EditSceneConfigView(EditIdBasedConfigView): elif cur_value[CONF_ID] == config_key: break else: - cur_value = dict() + cur_value = {} cur_value[CONF_ID] = config_key index = len(data) data.append(cur_value) diff --git a/homeassistant/components/device_tracker/setup.py b/homeassistant/components/device_tracker/setup.py index 595e36ef07c..3b7afbe25ee 100644 --- a/homeassistant/components/device_tracker/setup.py +++ b/homeassistant/components/device_tracker/setup.py @@ -170,7 +170,7 @@ def async_setup_scanner_platform( try: extra_attributes = await scanner.async_get_extra_attributes(mac) except NotImplementedError: - extra_attributes = dict() + extra_attributes = {} kwargs = { "mac": mac, diff --git a/homeassistant/components/dht/sensor.py b/homeassistant/components/dht/sensor.py index b9461fae7d7..cfd1cf2a197 100644 --- a/homeassistant/components/dht/sensor.py +++ b/homeassistant/components/dht/sensor.py @@ -165,7 +165,7 @@ class DHTClient: self.adafruit_dht = adafruit_dht self.sensor = sensor self.pin = pin - self.data = dict() + self.data = {} @Throttle(MIN_TIME_BETWEEN_UPDATES) def update(self): diff --git a/homeassistant/components/ecobee/weather.py b/homeassistant/components/ecobee/weather.py index b8d23b3e379..95ed220a16c 100644 --- a/homeassistant/components/ecobee/weather.py +++ b/homeassistant/components/ecobee/weather.py @@ -184,7 +184,7 @@ class EcobeeWeather(WeatherEntity): def _process_forecast(json): """Process a single ecobee API forecast to return expected values.""" - forecast = dict() + forecast = {} try: forecast[ATTR_FORECAST_TIME] = datetime.strptime( json["dateTime"], "%Y-%m-%d %H:%M:%S" diff --git a/homeassistant/components/emulated_hue/__init__.py b/homeassistant/components/emulated_hue/__init__.py index 6b234a9df7b..1c37d0215a8 100644 --- a/homeassistant/components/emulated_hue/__init__.py +++ b/homeassistant/components/emulated_hue/__init__.py @@ -228,7 +228,7 @@ class Config: self.entities = conf.get(CONF_ENTITIES, {}) - self._entities_with_hidden_attr_in_config = dict() + self._entities_with_hidden_attr_in_config = {} for entity_id in self.entities: hidden_value = self.entities[entity_id].get(CONF_ENTITY_HIDDEN, None) if hidden_value is not None: diff --git a/homeassistant/components/fail2ban/sensor.py b/homeassistant/components/fail2ban/sensor.py index 6e47cb45966..224ce83c214 100644 --- a/homeassistant/components/fail2ban/sensor.py +++ b/homeassistant/components/fail2ban/sensor.py @@ -108,7 +108,7 @@ class BanLogParser: """Initialize the parser.""" self.log_file = log_file self.data = list() - self.ip_regex = dict() + self.ip_regex = {} def read_log(self, jail): """Read the fail2ban log and find entries for jail.""" diff --git a/homeassistant/components/ifttt/__init__.py b/homeassistant/components/ifttt/__init__.py index 72c905497c0..c060c5f8815 100644 --- a/homeassistant/components/ifttt/__init__.py +++ b/homeassistant/components/ifttt/__init__.py @@ -64,7 +64,7 @@ async def async_setup(hass, config): value2 = call.data.get(ATTR_VALUE2) value3 = call.data.get(ATTR_VALUE3) - target_keys = dict() + target_keys = {} for target in targets: if target not in api_keys: _LOGGER.error("No IFTTT api key for %s", target) diff --git a/homeassistant/components/kodi/media_player.py b/homeassistant/components/kodi/media_player.py index dccc4ac0765..5f53de899e4 100644 --- a/homeassistant/components/kodi/media_player.py +++ b/homeassistant/components/kodi/media_player.py @@ -171,7 +171,7 @@ def _check_deprecated_turn_off(hass, turn_off_action): async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): """Set up the Kodi platform.""" if DOMAIN not in hass.data: - hass.data[DOMAIN] = dict() + hass.data[DOMAIN] = {} unique_id = None # Is this a manual configuration? diff --git a/homeassistant/components/meteo_france/weather.py b/homeassistant/components/meteo_france/weather.py index 1bdea073aae..2983c6b7d59 100644 --- a/homeassistant/components/meteo_france/weather.py +++ b/homeassistant/components/meteo_france/weather.py @@ -119,7 +119,7 @@ class MeteoFranceWeather(WeatherEntity): @property def device_state_attributes(self): """Return the state attributes.""" - data = dict() + data = {} if self._data and "next_rain" in self._data: data["next_rain"] = self._data["next_rain"] return data diff --git a/homeassistant/components/mhz19/sensor.py b/homeassistant/components/mhz19/sensor.py index 892895b9e02..e77f17c9140 100644 --- a/homeassistant/components/mhz19/sensor.py +++ b/homeassistant/components/mhz19/sensor.py @@ -124,7 +124,7 @@ class MHZClient: """Initialize the sensor.""" self.co2sensor = co2sens self._serial = serial - self.data = dict() + self.data = {} @Throttle(MIN_TIME_BETWEEN_UPDATES) def update(self): diff --git a/homeassistant/components/mpchc/media_player.py b/homeassistant/components/mpchc/media_player.py index a3f2c500030..b69fa651988 100644 --- a/homeassistant/components/mpchc/media_player.py +++ b/homeassistant/components/mpchc/media_player.py @@ -68,7 +68,7 @@ class MpcHcDevice(MediaPlayerDevice): """Initialize the MPC-HC device.""" self._name = name self._url = url - self._player_variables = dict() + self._player_variables = {} self._available = False def update(self): @@ -83,7 +83,7 @@ class MpcHcDevice(MediaPlayerDevice): self._available = True except requests.exceptions.RequestException: _LOGGER.error("Could not connect to MPC-HC at: %s", self._url) - self._player_variables = dict() + self._player_variables = {} self._available = False def _send_command(self, command_id): diff --git a/homeassistant/components/nanoleaf/light.py b/homeassistant/components/nanoleaf/light.py index 4b08d0b9751..612e1b6ead9 100644 --- a/homeassistant/components/nanoleaf/light.py +++ b/homeassistant/components/nanoleaf/light.py @@ -57,7 +57,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None): """Set up the Nanoleaf light.""" if DATA_NANOLEAF not in hass.data: - hass.data[DATA_NANOLEAF] = dict() + hass.data[DATA_NANOLEAF] = {} token = "" if discovery_info is not None: diff --git a/homeassistant/components/plant/__init__.py b/homeassistant/components/plant/__init__.py index c26c3f5e68a..3e35559bb62 100644 --- a/homeassistant/components/plant/__init__.py +++ b/homeassistant/components/plant/__init__.py @@ -161,9 +161,9 @@ class Plant(Entity): def __init__(self, name, config): """Initialize the Plant component.""" self._config = config - self._sensormap = dict() - self._readingmap = dict() - self._unit_of_measurement = dict() + self._sensormap = {} + self._readingmap = {} + self._unit_of_measurement = {} for reading, entity_id in config["sensors"].items(): self._sensormap[entity_id] = reading self._readingmap[reading] = entity_id @@ -371,7 +371,7 @@ class DailyHistory: """Create new DailyHistory with a maximum length of the history.""" self.max_length = max_length self._days = None - self._max_dict = dict() + self._max_dict = {} self.max = None def add_measurement(self, value, timestamp=None): diff --git a/homeassistant/components/remember_the_milk/__init__.py b/homeassistant/components/remember_the_milk/__init__.py index ec70c9d4329..d31d83d3e9d 100644 --- a/homeassistant/components/remember_the_milk/__init__.py +++ b/homeassistant/components/remember_the_milk/__init__.py @@ -157,7 +157,7 @@ class RememberTheMilkConfiguration: """Create new instance of configuration.""" self._config_file_path = hass.config.path(CONFIG_FILE_NAME) if not os.path.isfile(self._config_file_path): - self._config = dict() + self._config = {} return try: _LOGGER.debug("Loading configuration from file: %s", self._config_file_path) @@ -168,7 +168,7 @@ class RememberTheMilkConfiguration: "Failed to load configuration file, creating a new one: %s", self._config_file_path, ) - self._config = dict() + self._config = {} def save_config(self): """Write the configuration to a file.""" @@ -198,9 +198,9 @@ class RememberTheMilkConfiguration: def _initialize_profile(self, profile_name): """Initialize the data structures for a profile.""" if profile_name not in self._config: - self._config[profile_name] = dict() + self._config[profile_name] = {} if CONF_ID_MAP not in self._config[profile_name]: - self._config[profile_name][CONF_ID_MAP] = dict() + self._config[profile_name][CONF_ID_MAP] = {} def get_rtm_id(self, profile_name, hass_id): """Get the RTM ids for a Home Assistant task ID. diff --git a/homeassistant/components/stt/__init__.py b/homeassistant/components/stt/__init__.py index b39ab88484b..43ef01a497e 100644 --- a/homeassistant/components/stt/__init__.py +++ b/homeassistant/components/stt/__init__.py @@ -184,7 +184,7 @@ class SpeechToTextView(HomeAssistantView): return None # Convert Header data - args = dict() + args = {} for value in data: value = value.strip() args[value.partition("=")[0]] = value.partition("=")[2] diff --git a/homeassistant/components/ted5000/sensor.py b/homeassistant/components/ted5000/sensor.py index e0025a050c3..2e6246d06dd 100644 --- a/homeassistant/components/ted5000/sensor.py +++ b/homeassistant/components/ted5000/sensor.py @@ -90,7 +90,7 @@ class Ted5000Gateway: def __init__(self, url): """Initialize the data object.""" self.url = url - self.data = dict() + self.data = {} @Throttle(MIN_TIME_BETWEEN_UPDATES) def update(self): diff --git a/homeassistant/components/template/__init__.py b/homeassistant/components/template/__init__.py index f100d663d8c..11ad02975ee 100644 --- a/homeassistant/components/template/__init__.py +++ b/homeassistant/components/template/__init__.py @@ -11,7 +11,7 @@ _LOGGER = logging.getLogger(__name__) def initialise_templates(hass, templates, attribute_templates=None): """Initialise templates and attribute templates.""" if attribute_templates is None: - attribute_templates = dict() + attribute_templates = {} for template in chain(templates.values(), attribute_templates.values()): if template is None: continue @@ -23,7 +23,7 @@ def extract_entities( ): """Extract entity ids from templates and attribute templates.""" if attribute_templates is None: - attribute_templates = dict() + attribute_templates = {} entity_ids = set() if manual_entity_ids is None: invalid_templates = [] diff --git a/homeassistant/components/ubus/device_tracker.py b/homeassistant/components/ubus/device_tracker.py index 8c83de202a4..1f5b5b4b1b6 100644 --- a/homeassistant/components/ubus/device_tracker.py +++ b/homeassistant/components/ubus/device_tracker.py @@ -94,7 +94,7 @@ class UbusDeviceScanner(DeviceScanner): def _generate_mac2name(self): """Return empty MAC to name dict. Overridden if DHCP server is set.""" - self.mac2name = dict() + self.mac2name = {} @_refresh_on_access_denied def get_device_name(self, device): @@ -170,7 +170,7 @@ class DnsmasqUbusDeviceScanner(UbusDeviceScanner): self.url, self.session_id, "call", "file", "read", path=self.leasefile ) if result: - self.mac2name = dict() + self.mac2name = {} for line in result["data"].splitlines(): hosts = line.split(" ") self.mac2name[hosts[1].upper()] = hosts[3] @@ -185,7 +185,7 @@ class OdhcpdUbusDeviceScanner(UbusDeviceScanner): def _generate_mac2name(self): result = _req_json_rpc(self.url, self.session_id, "call", "dhcp", "ipv4leases") if result: - self.mac2name = dict() + self.mac2name = {} for device in result["device"].values(): for lease in device["leases"]: mac = lease["mac"] # mac = aabbccddeeff diff --git a/homeassistant/components/volumio/media_player.py b/homeassistant/components/volumio/media_player.py index 90e62c0d951..5778df8c367 100644 --- a/homeassistant/components/volumio/media_player.py +++ b/homeassistant/components/volumio/media_player.py @@ -79,7 +79,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( async def async_setup_platform(hass, config, async_add_entities, discovery_info=None): """Set up the Volumio platform.""" if DATA_VOLUMIO not in hass.data: - hass.data[DATA_VOLUMIO] = dict() + hass.data[DATA_VOLUMIO] = {} # This is a manual configuration? if discovery_info is None: diff --git a/tests/components/google_wifi/test_sensor.py b/tests/components/google_wifi/test_sensor.py index bddee724966..22059706dc5 100644 --- a/tests/components/google_wifi/test_sensor.py +++ b/tests/components/google_wifi/test_sensor.py @@ -106,7 +106,7 @@ class TestGoogleWifiSensor(unittest.TestCase): conditions = google_wifi.MONITORED_CONDITIONS.keys() self.api = google_wifi.GoogleWifiAPI("localhost", conditions) self.name = NAME - self.sensor_dict = dict() + self.sensor_dict = {} for condition, cond_list in google_wifi.MONITORED_CONDITIONS.items(): sensor = google_wifi.GoogleWifiSensor(self.api, self.name, condition) name = f"{self.name}_{condition}" diff --git a/tests/components/template/test_cover.py b/tests/components/template/test_cover.py index 5109607d799..c8caf28ddf6 100644 --- a/tests/components/template/test_cover.py +++ b/tests/components/template/test_cover.py @@ -144,7 +144,7 @@ async def test_template_position(hass, calls): await hass.async_block_till_done() entity = hass.states.get("cover.test") - attrs = dict() + attrs = {} attrs["position"] = 42 hass.states.async_set(entity.entity_id, entity.state, attributes=attrs) await hass.async_block_till_done()