Skip to content

Fix pjlink issue #20510

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
MartinHjelmare merged 4 commits into from
Feb 1, 2019
Merged

Fix pjlink issue #20510

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8ff10b
Fix issue #16606
emkay82 Jan 27, 2019
7b7569f
Update pjlink.py
emkay82 Jan 30, 2019
ab1e241
Update pjlink.py
emkay82 Jan 31, 2019
a8ffdfa
Update pjlink.py
emkay82 Feb 1, 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
19 changes: 12 additions & 7 deletions homeassistant/components/media_player/pjlink.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,19 @@ def projector(self):
def update(self):
"""Get the latest state from the device."""
with self.projector() as projector:
pwstate = projector.get_power()
if pwstate == 'off':
try:
pwstate = projector.get_power()
if pwstate == 'on' or pwstate == 'warm-up':
self._pwstate = STATE_ON
else:
self._pwstate = STATE_OFF
self._muted = projector.get_mute()[1]
self._current_source = \
format_input_source(*projector.get_input())
except:

@houndci-bot houndci-bot Jan 27, 2019

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

do not use bare except'

@MartinHjelmare MartinHjelmare Jan 30, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Make sure to only catch exceptions we expect.

@emkay82 emkay82 Jan 30, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I could make the changes you mentioned, but I'm new to Github and don't know the processes yet. Do I have to open a new pull request or is it possible to modify the existing pull request?

@MartinHjelmare MartinHjelmare Jan 31, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just commit and push to the same branch and this PR will be updated.

self._pwstate = STATE_OFF
else:
self._pwstate = STATE_ON
self._muted = projector.get_mute()[1]
self._current_source = \
format_input_source(*projector.get_input())
self._muted = False
self._current_source = None

@property
def name(self):
Expand Down