Various string cleanups (#30435)

* Remove some unnecessary string concatenations

* Replace some simple str.formats with f-strings

* Replace some string concatenations with f-strings
This commit is contained in:
Ville Skyttä authored and Paulus Schoutsen committed 2020-01-03 14:47:06 +01:00
1 parent 5ad209c6fd
commit fa4fa30461
105 files changed
+241 -314

No files matched your search

@@ -110,7 +110,7 @@ class Itunes:
def _command(self, named_command):
"""Make a request for a controlling command."""
return self._request("PUT", "/" + named_command)
return self._request("PUT", f"/{named_command}")
def now_playing(self):
"""Return the current state."""
@@ -168,7 +168,7 @@ class Itunes:
def artwork_url(self):
"""Return a URL of the current track's album art."""
return self._base_url + "/artwork"
return f"{self._base_url}/artwork"
def airplay_devices(self):
"""Return a list of AirPlay devices."""
@@ -176,17 +176,17 @@ class Itunes:
def airplay_device(self, device_id):
"""Return an AirPlay device."""
return self._request("GET", "/airplay_devices/" + device_id)
return self._request("GET", f"/airplay_devices/{device_id}")
def toggle_airplay_device(self, device_id, toggle):
"""Toggle airplay device on or off, id, toggle True or False."""
command = "on" if toggle else "off"
path = "/airplay_devices/" + device_id + "/" + command
path = f"/airplay_devices/{device_id}/{command}"
return self._request("PUT", path)
def set_volume_airplay_device(self, device_id, level):
"""Set volume, returns current state of device, id,level 0-100."""
path = "/airplay_devices/" + device_id + "/volume"
path = f"/airplay_devices/{device_id}/volume"
return self._request("PUT", path, {"level": level})
@@ -431,7 +431,7 @@ class AirPlayDevice(MediaPlayerDevice):
if "name" in state_hash:
name = state_hash.get("name", "")
self.device_name = (name + " AirTunes Speaker").strip()
self.device_name = f"{name} AirTunes Speaker".strip()
if "kind" in state_hash:
self.kind = state_hash.get("kind", None)