diff --git a/homeassistant/components/twilio/__init__.py b/homeassistant/components/twilio/__init__.py index ea5629e7cab..15c6697b2f7 100644 --- a/homeassistant/components/twilio/__init__.py +++ b/homeassistant/components/twilio/__init__.py @@ -1,9 +1,12 @@ """Support for Twilio.""" +from twilio.rest import Client +from twilio.twiml import TwiML import voluptuous as vol -import homeassistant.helpers.config_validation as cv from homeassistant.const import CONF_WEBHOOK_ID from homeassistant.helpers import config_entry_flow +import homeassistant.helpers.config_validation as cv + from .const import DOMAIN CONF_ACCOUNT_SID = "account_sid" @@ -28,8 +31,6 @@ CONFIG_SCHEMA = vol.Schema( async def async_setup(hass, config): """Set up the Twilio component.""" - from twilio.rest import Client - if DOMAIN not in config: return True @@ -42,8 +43,6 @@ async def async_setup(hass, config): async def handle_webhook(hass, webhook_id, request): """Handle incoming webhook from Twilio for inbound messages and calls.""" - from twilio.twiml import TwiML - data = dict(await request.post()) data["webhook_id"] = webhook_id hass.bus.async_fire(RECEIVED_DATA, dict(data)) diff --git a/homeassistant/components/twilio/config_flow.py b/homeassistant/components/twilio/config_flow.py index dad8e0bf496..1539c1ffadc 100644 --- a/homeassistant/components/twilio/config_flow.py +++ b/homeassistant/components/twilio/config_flow.py @@ -3,7 +3,6 @@ from homeassistant.helpers import config_entry_flow from .const import DOMAIN - config_entry_flow.register_webhook_flow( DOMAIN, "Twilio Webhook", diff --git a/homeassistant/components/twilio/manifest.json b/homeassistant/components/twilio/manifest.json index 23fac51a347..8f4ed125fb6 100644 --- a/homeassistant/components/twilio/manifest.json +++ b/homeassistant/components/twilio/manifest.json @@ -4,7 +4,7 @@ "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/twilio", "requirements": [ - "twilio==6.19.1" + "twilio==6.32.0" ], "dependencies": [ "webhook" diff --git a/homeassistant/components/twilio_call/notify.py b/homeassistant/components/twilio_call/notify.py index 0672a3d3b9e..82705091814 100644 --- a/homeassistant/components/twilio_call/notify.py +++ b/homeassistant/components/twilio_call/notify.py @@ -4,14 +4,13 @@ import urllib import voluptuous as vol -from homeassistant.components.twilio import DATA_TWILIO -import homeassistant.helpers.config_validation as cv - from homeassistant.components.notify import ( ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService, ) +from homeassistant.components.twilio import DATA_TWILIO +import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/twilio_sms/notify.py b/homeassistant/components/twilio_sms/notify.py index bd873f13468..da5e0e754b9 100644 --- a/homeassistant/components/twilio_sms/notify.py +++ b/homeassistant/components/twilio_sms/notify.py @@ -3,15 +3,14 @@ import logging import voluptuous as vol -from homeassistant.components.twilio import DATA_TWILIO -import homeassistant.helpers.config_validation as cv - from homeassistant.components.notify import ( + ATTR_DATA, ATTR_TARGET, PLATFORM_SCHEMA, BaseNotificationService, - ATTR_DATA, ) +from homeassistant.components.twilio import DATA_TWILIO +import homeassistant.helpers.config_validation as cv _LOGGER = logging.getLogger(__name__) @@ -26,6 +25,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( r"^\+?[1-9]\d{1,14}$|" r"^(?=.{1,11}$)[a-zA-Z0-9\s]*" r"[a-zA-Z][a-zA-Z0-9\s]*$" + r"^(?:[a-zA-Z]+)\:?\+?[1-9]\d{1,14}$|" ), ) } diff --git a/requirements_all.txt b/requirements_all.txt index 9a7ff3bb14b..149ad6234eb 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1909,7 +1909,7 @@ tuyaha==0.0.4 twentemilieu==0.1.0 # homeassistant.components.twilio -twilio==6.19.1 +twilio==6.32.0 # homeassistant.components.upcloud upcloud-api==0.4.3 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 047ed96bf10..71cbac4de0f 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -596,7 +596,7 @@ transmissionrpc==0.11 twentemilieu==0.1.0 # homeassistant.components.twilio -twilio==6.19.1 +twilio==6.32.0 # homeassistant.components.uvc uvcclient==0.11.0