From db55b1381a646b1cac5970ad3a79965ea5628988 Mon Sep 17 00:00:00 2001 From: Ryan McLean Date: Thu, 15 Feb 2018 20:39:22 +0000 Subject: [PATCH 1/3] Fix for contentRating --- homeassistant/components/media_player/plex.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/media_player/plex.py b/homeassistant/components/media_player/plex.py index b2a89341cf0728..1442438150127b 100644 --- a/homeassistant/components/media_player/plex.py +++ b/homeassistant/components/media_player/plex.py @@ -370,7 +370,8 @@ def refresh(self, device, session): self._is_player_available = False self._media_position = self._session.viewOffset self._media_content_id = self._session.ratingKey - self._media_content_rating = self._session.contentRating + self._media_content_rating = self._session.contentRating \ + if hasattr(self._session, 'contentRating') else None self._set_player_state() From 0163889eac183dcb48a0632cc0059d5a1ce716bf Mon Sep 17 00:00:00 2001 From: Ryan McLean Date: Fri, 16 Feb 2018 10:56:19 +0000 Subject: [PATCH 2/3] Use getattr instead of hasattr --- homeassistant/components/media_player/plex.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/homeassistant/components/media_player/plex.py b/homeassistant/components/media_player/plex.py index 1442438150127b..7eabca9122e462 100644 --- a/homeassistant/components/media_player/plex.py +++ b/homeassistant/components/media_player/plex.py @@ -370,8 +370,7 @@ def refresh(self, device, session): self._is_player_available = False self._media_position = self._session.viewOffset self._media_content_id = self._session.ratingKey - self._media_content_rating = self._session.contentRating \ - if hasattr(self._session, 'contentRating') else None + self._media_content_rating = getattr(self._session, 'contentRating', None) self._set_player_state() From d880423286d4b2423c7bc47c9fb7c6da2d2da3b2 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Fri, 16 Feb 2018 10:35:42 -0800 Subject: [PATCH 3/3] Lint --- homeassistant/components/media_player/plex.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/media_player/plex.py b/homeassistant/components/media_player/plex.py index 7eabca9122e462..dc38bb17dd3b64 100644 --- a/homeassistant/components/media_player/plex.py +++ b/homeassistant/components/media_player/plex.py @@ -370,7 +370,8 @@ def refresh(self, device, session): self._is_player_available = False self._media_position = self._session.viewOffset self._media_content_id = self._session.ratingKey - self._media_content_rating = getattr(self._session, 'contentRating', None) + self._media_content_rating = getattr( + self._session, 'contentRating', None) self._set_player_state()