diff --git a/homeassistant/components/fritz/__init__.py b/homeassistant/components/fritz/__init__.py index 568364c45ac..d3e15ea0e67 100644 --- a/homeassistant/components/fritz/__init__.py +++ b/homeassistant/components/fritz/__init__.py @@ -1,9 +1,11 @@ """Support for AVM Fritz!Box functions.""" import logging -from fritzconnection.core.exceptions import FritzConnectionException, FritzSecurityError -from fritzconnection.core.logger import fritzlogger -from requests import exceptions +from fritzconnection.core.exceptions import ( + FritzConnectionException, + FritzResourceError, + FritzSecurityError, +) from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME @@ -16,13 +18,6 @@ from .services import async_setup_services, async_unload_services _LOGGER = logging.getLogger(__name__) -level = _LOGGER.getEffectiveLevel() -_LOGGER.info( - "Setting logging level of fritzconnection: %s", logging.getLevelName(level) -) -fritzlogger.set_level(level) -fritzlogger.enable() - async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: """Set up fritzboxtools from config entry.""" @@ -39,7 +34,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: await fritz_tools.async_setup(entry.options) except FritzSecurityError as ex: raise ConfigEntryAuthFailed from ex - except (FritzConnectionException, exceptions.ConnectionError) as ex: + except (FritzConnectionException, FritzResourceError) as ex: raise ConfigEntryNotReady from ex hass.data.setdefault(DOMAIN, {}) diff --git a/homeassistant/components/fritz/manifest.json b/homeassistant/components/fritz/manifest.json index 219e8f946ae..f4de17fe80c 100644 --- a/homeassistant/components/fritz/manifest.json +++ b/homeassistant/components/fritz/manifest.json @@ -3,7 +3,7 @@ "name": "AVM FRITZ!Box Tools", "documentation": "https://www.home-assistant.io/integrations/fritz", "requirements": [ - "fritzconnection==1.7.2", + "fritzconnection==1.8.0", "xmltodict==0.12.0" ], "dependencies": ["network"], diff --git a/homeassistant/components/fritzbox_callmonitor/__init__.py b/homeassistant/components/fritzbox_callmonitor/__init__.py index edf463a84eb..4c36ee3ddfb 100644 --- a/homeassistant/components/fritzbox_callmonitor/__init__.py +++ b/homeassistant/components/fritzbox_callmonitor/__init__.py @@ -2,7 +2,6 @@ import logging from fritzconnection.core.exceptions import FritzConnectionException, FritzSecurityError -from fritzconnection.core.logger import fritzlogger from requests.exceptions import ConnectionError as RequestsConnectionError from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME @@ -20,13 +19,6 @@ from .const import ( _LOGGER = logging.getLogger(__name__) -level = _LOGGER.getEffectiveLevel() -_LOGGER.info( - "Setting logging level of fritzconnection: %s", logging.getLevelName(level) -) -fritzlogger.set_level(level) -fritzlogger.enable() - async def async_setup_entry(hass, config_entry): """Set up the fritzbox_callmonitor platforms.""" diff --git a/homeassistant/components/fritzbox_callmonitor/manifest.json b/homeassistant/components/fritzbox_callmonitor/manifest.json index 91bd73a6efd..b28d76a71cc 100644 --- a/homeassistant/components/fritzbox_callmonitor/manifest.json +++ b/homeassistant/components/fritzbox_callmonitor/manifest.json @@ -3,7 +3,7 @@ "name": "AVM FRITZ!Box Call Monitor", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/fritzbox_callmonitor", - "requirements": ["fritzconnection==1.7.2"], + "requirements": ["fritzconnection==1.8.0"], "codeowners": [], "iot_class": "local_polling" } diff --git a/requirements_all.txt b/requirements_all.txt index 9454303a343..a0d893895ea 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -688,7 +688,7 @@ freesms==0.2.0 # homeassistant.components.fritz # homeassistant.components.fritzbox_callmonitor -fritzconnection==1.7.2 +fritzconnection==1.8.0 # homeassistant.components.google_translate gTTS==2.2.3 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index f464e43470f..d9c8b9f7165 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -422,7 +422,7 @@ freebox-api==0.0.10 # homeassistant.components.fritz # homeassistant.components.fritzbox_callmonitor -fritzconnection==1.7.2 +fritzconnection==1.8.0 # homeassistant.components.google_translate gTTS==2.2.3