Move imports in netatmo component (#27360)

This commit is contained in:
Quentame 2019-10-10 09:22:10 +02:00 committed by Paulus Schoutsen
parent 6c739f4be5
commit 7718d61cd7
5 changed files with 8 additions and 23 deletions

View File

@ -3,6 +3,7 @@ import logging
from datetime import timedelta from datetime import timedelta
from urllib.error import HTTPError from urllib.error import HTTPError
import pyatmo
import voluptuous as vol import voluptuous as vol
from homeassistant.const import ( from homeassistant.const import (
@ -89,7 +90,6 @@ SCHEMA_SERVICE_DROPWEBHOOK = vol.Schema({})
def setup(hass, config): def setup(hass, config):
"""Set up the Netatmo devices.""" """Set up the Netatmo devices."""
import pyatmo
hass.data[DATA_PERSONS] = {} hass.data[DATA_PERSONS] = {}
try: try:
@ -254,8 +254,6 @@ class CameraData:
@Throttle(MIN_TIME_BETWEEN_UPDATES) @Throttle(MIN_TIME_BETWEEN_UPDATES)
def update(self): def update(self):
"""Call the Netatmo API to update the data.""" """Call the Netatmo API to update the data."""
import pyatmo
self.camera_data = pyatmo.CameraData(self.auth, size=100) self.camera_data = pyatmo.CameraData(self.auth, size=100)
@Throttle(MIN_TIME_BETWEEN_EVENT_UPDATES) @Throttle(MIN_TIME_BETWEEN_EVENT_UPDATES)

View File

@ -1,6 +1,7 @@
"""Support for the Netatmo binary sensors.""" """Support for the Netatmo binary sensors."""
import logging import logging
from pyatmo import NoDevice
import voluptuous as vol import voluptuous as vol
from homeassistant.components.binary_sensor import PLATFORM_SCHEMA, BinarySensorDevice from homeassistant.components.binary_sensor import PLATFORM_SCHEMA, BinarySensorDevice
@ -58,15 +59,13 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
module_name = None module_name = None
import pyatmo
auth = hass.data[DATA_NETATMO_AUTH] auth = hass.data[DATA_NETATMO_AUTH]
try: try:
data = CameraData(hass, auth, home) data = CameraData(hass, auth, home)
if not data.get_camera_names(): if not data.get_camera_names():
return None return None
except pyatmo.NoDevice: except NoDevice:
return None return None
welcome_sensors = config.get(CONF_WELCOME_SENSORS, WELCOME_SENSOR_TYPES) welcome_sensors = config.get(CONF_WELCOME_SENSORS, WELCOME_SENSOR_TYPES)

View File

@ -1,6 +1,7 @@
"""Support for the Netatmo cameras.""" """Support for the Netatmo cameras."""
import logging import logging
from pyatmo import NoDevice
import requests import requests
import voluptuous as vol import voluptuous as vol
@ -38,7 +39,6 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
home = config.get(CONF_HOME) home = config.get(CONF_HOME)
verify_ssl = config.get(CONF_VERIFY_SSL, True) verify_ssl = config.get(CONF_VERIFY_SSL, True)
quality = config.get(CONF_QUALITY, DEFAULT_QUALITY) quality = config.get(CONF_QUALITY, DEFAULT_QUALITY)
import pyatmo
auth = hass.data[DATA_NETATMO_AUTH] auth = hass.data[DATA_NETATMO_AUTH]
@ -60,7 +60,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
] ]
) )
data.get_persons() data.get_persons()
except pyatmo.NoDevice: except NoDevice:
return None return None

View File

@ -3,6 +3,7 @@ from datetime import timedelta
import logging import logging
from typing import Optional, List from typing import Optional, List
import pyatmo
import requests import requests
import voluptuous as vol import voluptuous as vol
@ -103,8 +104,6 @@ NA_VALVE = "NRV"
def setup_platform(hass, config, add_entities, discovery_info=None): def setup_platform(hass, config, add_entities, discovery_info=None):
"""Set up the NetAtmo Thermostat.""" """Set up the NetAtmo Thermostat."""
import pyatmo
homes_conf = config.get(CONF_HOMES) homes_conf = config.get(CONF_HOMES)
auth = hass.data[DATA_NETATMO_AUTH] auth = hass.data[DATA_NETATMO_AUTH]
@ -365,8 +364,6 @@ class HomeData:
def setup(self): def setup(self):
"""Retrieve HomeData by NetAtmo API.""" """Retrieve HomeData by NetAtmo API."""
import pyatmo
try: try:
self.homedata = pyatmo.HomeData(self.auth) self.homedata = pyatmo.HomeData(self.auth)
self.home_id = self.homedata.gethomeId(self.home) self.home_id = self.homedata.gethomeId(self.home)
@ -408,8 +405,6 @@ class ThermostatData:
def setup(self): def setup(self):
"""Retrieve HomeData and HomeStatus by NetAtmo API.""" """Retrieve HomeData and HomeStatus by NetAtmo API."""
import pyatmo
try: try:
self.homedata = pyatmo.HomeData(self.auth) self.homedata = pyatmo.HomeData(self.auth)
self.homestatus = pyatmo.HomeStatus(self.auth, home_id=self.home_id) self.homestatus = pyatmo.HomeStatus(self.auth, home_id=self.home_id)
@ -423,8 +418,6 @@ class ThermostatData:
@Throttle(MIN_TIME_BETWEEN_UPDATES) @Throttle(MIN_TIME_BETWEEN_UPDATES)
def update(self): def update(self):
"""Call the NetAtmo API to update the data.""" """Call the NetAtmo API to update the data."""
import pyatmo
try: try:
self.homestatus = pyatmo.HomeStatus(self.auth, home_id=self.home_id) self.homestatus = pyatmo.HomeStatus(self.auth, home_id=self.home_id)
except TypeError: except TypeError:

View File

@ -4,6 +4,7 @@ import threading
from datetime import timedelta from datetime import timedelta
from time import time from time import time
import pyatmo
import requests import requests
import voluptuous as vol import voluptuous as vol
@ -174,8 +175,6 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
if _dev: if _dev:
add_entities(_dev, True) add_entities(_dev, True)
import pyatmo
for data_class in [pyatmo.WeatherStationData, pyatmo.HomeCoachData]: for data_class in [pyatmo.WeatherStationData, pyatmo.HomeCoachData]:
try: try:
data = NetatmoData(auth, data_class, config.get(CONF_STATION)) data = NetatmoData(auth, data_class, config.get(CONF_STATION))
@ -512,8 +511,6 @@ class NetatmoPublicData:
@Throttle(MIN_TIME_BETWEEN_UPDATES) @Throttle(MIN_TIME_BETWEEN_UPDATES)
def update(self): def update(self):
"""Request an update from the Netatmo API.""" """Request an update from the Netatmo API."""
import pyatmo
data = pyatmo.PublicData( data = pyatmo.PublicData(
self.auth, self.auth,
LAT_NE=self.lat_ne, LAT_NE=self.lat_ne,
@ -559,12 +556,10 @@ class NetatmoData:
if time() < self._next_update or not self._update_in_progress.acquire(False): if time() < self._next_update or not self._update_in_progress.acquire(False):
return return
try: try:
from pyatmo import NoDevice
try: try:
self.station_data = self.data_class(self.auth) self.station_data = self.data_class(self.auth)
_LOGGER.debug("%s detected!", str(self.data_class.__name__)) _LOGGER.debug("%s detected!", str(self.data_class.__name__))
except NoDevice: except pyatmo.NoDevice:
_LOGGER.warning( _LOGGER.warning(
"No Weather or HomeCoach devices found for %s", str(self.station) "No Weather or HomeCoach devices found for %s", str(self.station)
) )