Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions homeassistant/components/powerwall/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import logging

import requests
from tesla_powerwall import ApiError, Powerwall, PowerwallUnreachableError
from tesla_powerwall import APIError, Powerwall, PowerwallUnreachableError
import voluptuous as vol

from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
Expand Down Expand Up @@ -96,8 +96,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
http_session = requests.Session()
power_wall = Powerwall(entry.data[CONF_IP_ADDRESS], http_session=http_session)
try:
await hass.async_add_executor_job(power_wall.detect_and_pin_version)
powerwall_data = await hass.async_add_executor_job(call_base_info, power_wall)
except (PowerwallUnreachableError, ApiError, ConnectionError):
except (PowerwallUnreachableError, APIError, ConnectionError):
http_session.close()
raise ConfigEntryNotReady

Expand Down
5 changes: 3 additions & 2 deletions homeassistant/components/powerwall/config_flow.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Config flow for Tesla Powerwall integration."""
import logging

from tesla_powerwall import ApiError, Powerwall, PowerwallUnreachableError
from tesla_powerwall import APIError, Powerwall, PowerwallUnreachableError
import voluptuous as vol

from homeassistant import config_entries, core, exceptions
Expand All @@ -23,8 +23,9 @@ async def validate_input(hass: core.HomeAssistant, data):
power_wall = Powerwall(data[CONF_IP_ADDRESS])

try:
await hass.async_add_executor_job(power_wall.detect_and_pin_version)
site_info = await hass.async_add_executor_job(power_wall.get_site_info)
except (PowerwallUnreachableError, ApiError, ConnectionError):
except (PowerwallUnreachableError, APIError, ConnectionError):
raise CannotConnect

# Return info that you want to store in the config entry.
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/powerwall/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "Tesla Powerwall",
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/powerwall",
"requirements": ["tesla-powerwall==0.2.5"],
"requirements": ["tesla-powerwall==0.2.8"],
"codeowners": ["@bdraco", "@jrester"]
}
2 changes: 1 addition & 1 deletion requirements_all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2026,7 +2026,7 @@ temperusb==1.5.3
# tensorflow==1.13.2

# homeassistant.components.powerwall
tesla-powerwall==0.2.5
tesla-powerwall==0.2.8

# homeassistant.components.tesla
teslajsonpy==0.8.0
Expand Down
2 changes: 1 addition & 1 deletion requirements_test_all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ sunwatcher==0.2.1
tellduslive==0.10.10

# homeassistant.components.powerwall
tesla-powerwall==0.2.5
tesla-powerwall==0.2.8

# homeassistant.components.tesla
teslajsonpy==0.8.0
Expand Down