From 0860ce4099c56652c223010557ca18eb810e3d25 Mon Sep 17 00:00:00 2001
From: Greg Dowling <pavoni@users.noreply.github.com>
Date: Wed, 28 Oct 2020 16:32:23 +0000
Subject: [PATCH] Tidy after adding group services to roon media player
 (#42512)

* Tidy after adding roon group services.

* Fix missed changes.
---
 homeassistant/components/roon/media_player.py | 20 +++++++++----------
 homeassistant/components/roon/server.py       |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/roon/media_player.py b/homeassistant/components/roon/media_player.py
index beac635fdba..e0ae86b781a 100644
--- a/homeassistant/components/roon/media_player.py
+++ b/homeassistant/components/roon/media_player.py
@@ -523,7 +523,7 @@ class RoonDevice(MediaPlayerEntity):
                     zone["display_name"] != self.name
                     and output["output_id"]
                     in self.player_data["can_group_with_output_ids"]
-                    and zone["display_name"] not in sync_available.keys()
+                    and zone["display_name"] not in sync_available
                 ):
                     sync_available[zone["display_name"]] = output["output_id"]
 
@@ -533,17 +533,17 @@ class RoonDevice(MediaPlayerEntity):
             if name is None:
                 _LOGGER.error("No roon player found for %s", entity_id)
                 return
-            if name not in sync_available.keys():
+            if name not in sync_available:
                 _LOGGER.error(
                     "Can't join player %s with %s because it's not in the join available list %s",
                     name,
                     self.name,
-                    list(sync_available.keys()),
+                    list(sync_available),
                 )
                 return
             names.append(name)
 
-        _LOGGER.info("Joining %s to %s", names, self.name)
+        _LOGGER.debug("Joining %s to %s", names, self.name)
         self._server.roonapi.group_outputs(
             [self._output_id] + [sync_available[name] for name in names]
         )
@@ -564,7 +564,7 @@ class RoonDevice(MediaPlayerEntity):
 
         if unjoin_ids is None:
             # unjoin everything
-            names = list(join_group.keys())
+            names = list(join_group)
         else:
             names = []
             for entity_id in unjoin_ids:
@@ -573,17 +573,17 @@ class RoonDevice(MediaPlayerEntity):
                     _LOGGER.error("No roon player found for %s", entity_id)
                     return
 
-                if name not in join_group.keys():
+                if name not in join_group:
                     _LOGGER.error(
                         "Can't unjoin player %s from %s because it's not in the joined group %s",
                         name,
                         self.name,
-                        list(join_group.keys()),
+                        list(join_group),
                     )
                     return
                 names.append(name)
 
-        _LOGGER.info("Unjoining %s from %s", names, self.name)
+        _LOGGER.debug("Unjoining %s from %s", names, self.name)
         self._server.roonapi.ungroup_outputs([join_group[name] for name in names])
 
     async def async_transfer(self, transfer_id):
@@ -606,10 +606,10 @@ class RoonDevice(MediaPlayerEntity):
                 "Can't transfer from %s to %s because destination is not known %s",
                 self.name,
                 transfer_id,
-                list(zone_ids.keys()),
+                list(zone_ids),
             )
 
-        _LOGGER.info("Transferring from %s to %s", self.name, name)
+        _LOGGER.debug("Transferring from %s to %s", self.name, name)
         await self.hass.async_add_executor_job(
             self._server.roonapi.transfer_zone, self._zone_id, transfer_id
         )
diff --git a/homeassistant/components/roon/server.py b/homeassistant/components/roon/server.py
index c2766c648c4..0229f3492be 100644
--- a/homeassistant/components/roon/server.py
+++ b/homeassistant/components/roon/server.py
@@ -76,7 +76,7 @@ class RoonServer:
 
     def roon_name(self, entity_id):
         """Get the name of the roon player from entity_id."""
-        return self._roon_name_by_id[entity_id]
+        return self._roon_name_by_id.get(entity_id)
 
     def stop_roon(self):
         """Stop background worker."""