Skip to content

Add setup type hints to yamaha #63811

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
frenck merged 9 commits into from
Jan 10, 2022
Merged

Add setup type hints to yamaha #63811

Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
84fb677
Add setup type hints to yamaha
epenet Jan 10, 2022
fd52742
Fix type hint
epenet Jan 10, 2022
b89f39f
Remove check
epenet Jan 10, 2022
9c72f20
Once more
epenet Jan 10, 2022
f93b84f
Adjust YamahaConfigInfo
epenet Jan 10, 2022
70fd267
Fix tests
epenet Jan 10, 2022
1137dcb
Simplify test amends
epenet Jan 10, 2022
6251241
Once more
epenet Jan 10, 2022
51fc5b7
Remove logger
epenet Jan 10, 2022
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
22 changes: 15 additions & 7 deletions homeassistant/components/yamaha/media_player.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
STATE_ON,
STATE_PLAYING,
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers import config_validation as cv, entity_platform
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType

from .const import (
Expand Down Expand Up @@ -99,15 +101,17 @@
class YamahaConfigInfo:
"""Configuration Info for Yamaha Receivers."""

def __init__(self, config: ConfigType, discovery_info: DiscoveryInfoType) -> None:
def __init__(
self, config: ConfigType, discovery_info: DiscoveryInfoType | None

@epenet epenet Jan 10, 2022

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.

If discovery_info wasn't optional, it wouldn't make sense to check it afterwards:

        if discovery_info is not None:
            self.name = discovery_info.get("name")

) -> None:
"""Initialize the Configuration Info for Yamaha Receiver."""
self.name = config.get(CONF_NAME)
self.host = config.get(CONF_HOST)
self.ctrl_url: str | None = f"http://{self.host}:80/YamahaRemoteControl/ctrl"
self.source_ignore = config.get(CONF_SOURCE_IGNORE)
self.source_names = config.get(CONF_SOURCE_NAMES)
self.zone_ignore = config.get(CONF_ZONE_IGNORE)
self.zone_names = config.get(CONF_ZONE_NAMES)
self.source_ignore = config[CONF_SOURCE_IGNORE]
self.source_names = config[CONF_SOURCE_NAMES]
self.zone_ignore = config[CONF_ZONE_IGNORE]
self.zone_names = config[CONF_ZONE_NAMES]
Comment thread
epenet marked this conversation as resolved.
self.from_discovery = False
if discovery_info is not None:
self.name = discovery_info.get("name")
Expand Down Expand Up @@ -138,9 +142,13 @@ def _discovery(config_info):
return receivers


async def async_setup_platform(hass, config, async_add_entities, discovery_info=None):
async def async_setup_platform(
hass: HomeAssistant,
config: ConfigType,
async_add_entities: AddEntitiesCallback,
discovery_info: DiscoveryInfoType | None = None,
) -> None:
"""Set up the Yamaha platform."""

# Keep track of configured receivers so that we don't end up
# discovering a receiver dynamically that we have static config
# for. Map each device from its zone_id .
Expand Down