From 630d85ec78f7bb2a5ab4a68175d3b153581f46d6 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 22 May 2020 13:41:14 +0200 Subject: [PATCH] Use f-strings where possible (#1740) --- supervisor/addons/addon.py | 2 +- supervisor/api/audio.py | 2 +- supervisor/api/dns.py | 2 +- supervisor/api/ingress.py | 2 +- supervisor/api/multicast.py | 2 +- supervisor/api/supervisor.py | 2 +- supervisor/snapshots/utils.py | 2 +- supervisor/snapshots/validate.py | 2 +- supervisor/store/__init__.py | 2 +- supervisor/store/data.py | 2 +- supervisor/validate.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/supervisor/addons/addon.py b/supervisor/addons/addon.py index 1342831f8..3de1bca93 100644 --- a/supervisor/addons/addon.py +++ b/supervisor/addons/addon.py @@ -626,7 +626,7 @@ class Addon(AddonModel): _LOGGER.error("Add-on %s is not available for this Platform", self.slug) raise AddonsNotSupportedError() - # Restore local add-on informations + # Restore local add-on information _LOGGER.info("Restore config for addon %s", self.slug) restore_image = self._image(data[ATTR_SYSTEM]) self.sys_addons.data.restore( diff --git a/supervisor/api/audio.py b/supervisor/api/audio.py index d068ec60c..6020913e0 100644 --- a/supervisor/api/audio.py +++ b/supervisor/api/audio.py @@ -108,7 +108,7 @@ class APIAudio(CoreSysAttributes): version = body.get(ATTR_VERSION, self.sys_plugins.audio.latest_version) if version == self.sys_plugins.audio.version: - raise APIError("Version {} is already in use".format(version)) + raise APIError(f"Version {version} is already in use") await asyncio.shield(self.sys_plugins.audio.update(version)) @api_process_raw(CONTENT_TYPE_BINARY) diff --git a/supervisor/api/dns.py b/supervisor/api/dns.py index 0e51960d5..d41fe45e4 100644 --- a/supervisor/api/dns.py +++ b/supervisor/api/dns.py @@ -83,7 +83,7 @@ class APICoreDNS(CoreSysAttributes): version = body.get(ATTR_VERSION, self.sys_plugins.dns.latest_version) if version == self.sys_plugins.dns.version: - raise APIError("Version {} is already in use".format(version)) + raise APIError(f"Version {version} is already in use") await asyncio.shield(self.sys_plugins.dns.update(version)) @api_process_raw(CONTENT_TYPE_BINARY) diff --git a/supervisor/api/ingress.py b/supervisor/api/ingress.py index 36f363445..b6c69f2a2 100644 --- a/supervisor/api/ingress.py +++ b/supervisor/api/ingress.py @@ -129,7 +129,7 @@ class APIIngress(CoreSysAttributes): # Support GET query if request.query_string: - url = "{}?{}".format(url, request.query_string) + url = f"{url}?{request.query_string}" # Start proxy async with self.sys_websession.ws_connect( diff --git a/supervisor/api/multicast.py b/supervisor/api/multicast.py index a5df05c30..bdd470ae2 100644 --- a/supervisor/api/multicast.py +++ b/supervisor/api/multicast.py @@ -62,7 +62,7 @@ class APIMulticast(CoreSysAttributes): version = body.get(ATTR_VERSION, self.sys_plugins.multicast.latest_version) if version == self.sys_plugins.multicast.version: - raise APIError("Version {} is already in use".format(version)) + raise APIError(f"Version {version} is already in use") await asyncio.shield(self.sys_plugins.multicast.update(version)) @api_process_raw(CONTENT_TYPE_BINARY) diff --git a/supervisor/api/supervisor.py b/supervisor/api/supervisor.py index 7d5a6d9e7..857aff463 100644 --- a/supervisor/api/supervisor.py +++ b/supervisor/api/supervisor.py @@ -157,7 +157,7 @@ class APISupervisor(CoreSysAttributes): version = body.get(ATTR_VERSION, self.sys_updater.version_supervisor) if version == self.sys_supervisor.version: - raise APIError("Version {} is already in use".format(version)) + raise APIError(f"Version {version} is already in use") await asyncio.shield(self.sys_supervisor.update(version)) @api_process diff --git a/supervisor/snapshots/utils.py b/supervisor/snapshots/utils.py index bd45cb9f0..ad53b784f 100644 --- a/supervisor/snapshots/utils.py +++ b/supervisor/snapshots/utils.py @@ -33,7 +33,7 @@ def key_to_iv(key): def create_slug(name, date_str): """Generate a hash from repository.""" - key = "{} - {}".format(date_str, name).lower().encode() + key = f"{date_str} - {name}".lower().encode() return hashlib.sha1(key).hexdigest()[:8] diff --git a/supervisor/snapshots/validate.py b/supervisor/snapshots/validate.py index b3807ecaf..1c08e0ca8 100644 --- a/supervisor/snapshots/validate.py +++ b/supervisor/snapshots/validate.py @@ -38,7 +38,7 @@ ALL_FOLDERS = [FOLDER_HOMEASSISTANT, FOLDER_SHARE, FOLDER_ADDONS, FOLDER_SSL] def unique_addons(addons_list): """Validate that an add-on is unique.""" - single = set(addon[ATTR_SLUG] for addon in addons_list) + single = {addon[ATTR_SLUG] for addon in addons_list} if len(single) != len(addons_list): raise vol.Invalid("Invalid addon list on snapshot!") diff --git a/supervisor/store/__init__.py b/supervisor/store/__init__.py index 7b1942c22..cc0fbe750 100644 --- a/supervisor/store/__init__.py +++ b/supervisor/store/__init__.py @@ -11,7 +11,7 @@ from .repository import Repository _LOGGER: logging.Logger = logging.getLogger(__name__) -BUILTIN_REPOSITORIES = set((REPOSITORY_CORE, REPOSITORY_LOCAL)) +BUILTIN_REPOSITORIES = {REPOSITORY_CORE, REPOSITORY_LOCAL} class StoreManager(CoreSysAttributes): diff --git a/supervisor/store/data.py b/supervisor/store/data.py index ef0f60aaf..c41f5a431 100644 --- a/supervisor/store/data.py +++ b/supervisor/store/data.py @@ -91,7 +91,7 @@ class StoreData(CoreSysAttributes): continue # Generate slug - addon_slug = "{}_{}".format(repository, addon_config[ATTR_SLUG]) + addon_slug = f"{repository}_{addon_config[ATTR_SLUG]}" # store addon_config[ATTR_REPOSITORY] = repository diff --git a/supervisor/validate.py b/supervisor/validate.py index f1d87932c..535c04599 100644 --- a/supervisor/validate.py +++ b/supervisor/validate.py @@ -59,7 +59,7 @@ def dns_url(url: str) -> str: try: ipaddress.ip_address(address) # matches ipv4 or ipv6 addresses except ValueError: - raise vol.Invalid("Invalid DNS URL: {}".format(url)) + raise vol.Invalid(f"Invalid DNS URL: {url}") return url