Skip to content

SongPal: do not crash if active_source is not (yet) available - fixes #20343 #20344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rytilahti merged 3 commits into from
Jan 24, 2019
Merged

SongPal: do not crash if active_source is not (yet) available - fixes #20343 #20344

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
500e861
SongPal: error handling if active_source can't be detected
Censored3 Jan 23, 2019
27208a2
sonpal: Add comment to the use of getattr() for property source
Censored3 Jan 24, 2019
15fb3ac
songpal: make comment single-line
Censored3 Jan 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion homeassistant/components/media_player/songpal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,8 @@ def state(self):
@property
def source(self):
"""Return currently active source."""
return self._active_source.title
# Avoid a KeyError when _active_source is not (yet) populated
return getattr(self._active_source, 'title', None)
Copy link
Copy Markdown
Member

@rytilahti rytilahti Jan 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a single-line comment here describing the necessity of using getattr instead of regular attribute access here, then it's okay to merge.

Copy link
Copy Markdown
Contributor Author

@Censored3 Censored3 Jan 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure - here you go. Is this comment sufficient?

Copy link
Copy Markdown
Member

@rytilahti rytilahti Jan 24, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's good, thanks! I changed the title to be a bit more descriptive :-)


@property
def volume_level(self):
Expand Down