Use probatio.Port directly across integrations (#183741)

homeassistant/components/ads/__init__.py

@@ -53,7 +53,7 @@ CONFIG_SCHEMA = probatio.Schema(
         DOMAIN: probatio.Schema(
             {
                 probatio.Required(CONF_DEVICE): cv.string,
-                probatio.Required(CONF_PORT): cv.port,
+                probatio.Required(CONF_PORT): probatio.Port(),
                 probatio.Optional(CONF_IP_ADDRESS): cv.string,
             }
         )

homeassistant/components/amcrest/__init__.py

@@ -85,7 +85,7 @@ AMCREST_SCHEMA = probatio.Schema(
         probatio.Required(CONF_USERNAME): cv.string,
         probatio.Required(CONF_PASSWORD): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(
             CONF_AUTHENTICATION, default=HTTP_BASIC_AUTHENTICATION
         ): probatio.All(probatio.In(AUTHENTICATION_LIST)),

homeassistant/components/android_ip_webcam/config_flow.py

@@ -9,7 +9,6 @@ from pydroid_ipcam.exceptions import PyDroidIPCamException, Unauthorized
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DEFAULT_PORT, DOMAIN
@@ -17,7 +16,7 @@ from .const import DEFAULT_PORT, DOMAIN
 STEP_USER_DATA_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): str,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Inclusive(CONF_USERNAME, "authentication"): str,
         probatio.Inclusive(CONF_PASSWORD, "authentication"): str,
     }

homeassistant/components/androidtv/config_flow.py

@@ -16,7 +16,6 @@ from homeassistant.config_entries import (
 from homeassistant.const import CONF_DEVICE_CLASS, CONF_HOST, CONF_PORT
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import SectionConfig, section
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.selector import (
     ObjectSelector,
     SelectOptionDict,
@@ -100,7 +99,7 @@ class AndroidTVFlowHandler(ConfigFlow, domain=DOMAIN):
                         translation_key="device_class",
                     )
                 ),
-                probatio.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                probatio.Required(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
                 probatio.Required(CONF_MORE_OPTIONS): section(
                     probatio.Schema(
                         {
@@ -109,7 +108,7 @@ class AndroidTVFlowHandler(ConfigFlow, domain=DOMAIN):
                             probatio.Optional(
                                 CONF_ADB_SERVER_PORT,
                                 default=DEFAULT_ADB_SERVER_PORT,
-                            ): cv.port,
+                            ): probatio.Port(),
                         }
                     ),
                     SectionConfig(collapsed=True),

homeassistant/components/anel_pwrctrl/switch.py

@@ -27,8 +27,8 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=5)
 
 PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
     {
-        probatio.Required(CONF_PORT_RECV): cv.port,
-        probatio.Required(CONF_PORT_SEND): cv.port,
+        probatio.Required(CONF_PORT_RECV): probatio.Port(),
+        probatio.Required(CONF_PORT_SEND): probatio.Port(),
         probatio.Required(CONF_USERNAME): cv.string,
         probatio.Required(CONF_PASSWORD): cv.string,
         probatio.Optional(CONF_HOST): cv.string,

homeassistant/components/apache_kafka/__init__.py

@@ -32,7 +32,7 @@ CONFIG_SCHEMA = probatio.Schema(
         DOMAIN: probatio.Schema(
             {
                 probatio.Required(CONF_IP_ADDRESS): cv.string,
-                probatio.Required(CONF_PORT): cv.port,
+                probatio.Required(CONF_PORT): probatio.Port(),
                 probatio.Required(CONF_TOPIC): cv.string,
                 probatio.Optional(CONF_FILTER, default={}): FILTER_SCHEMA,
                 probatio.Optional(

homeassistant/components/aprilaire/config_flow.py

@@ -8,7 +8,6 @@ from pyaprilaire.const import Attribute
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 
 from .const import DOMAIN
@@ -17,7 +16,7 @@ from .coordinator import AprilaireCoordinator
 STEP_USER_DATA_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): str,
-        probatio.Required(CONF_PORT, default=7000): cv.port,
+        probatio.Required(CONF_PORT, default=7000): probatio.Port(),
     }
 )
 

homeassistant/components/apsystems/config_flow.py

@@ -16,7 +16,7 @@ from .const import DEFAULT_PORT, DOMAIN
 DATA_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_IP_ADDRESS): cv.string,
-        probatio.Optional(CONF_PORT): cv.port,
+        probatio.Optional(CONF_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/aqualogic/__init__.py

@@ -30,7 +30,7 @@ CONFIG_SCHEMA = probatio.Schema(
         DOMAIN: probatio.Schema(
             {
                 probatio.Required(CONF_HOST): cv.string,
-                probatio.Required(CONF_PORT): cv.port,
+                probatio.Required(CONF_PORT): probatio.Port(),
             }
         )
     },

homeassistant/components/aqualogic/config_flow.py

@@ -9,14 +9,13 @@ import probatio
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
-from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN
 
 STEP_USER_DATA_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): str,
-        probatio.Required(CONF_PORT): cv.port,
+        probatio.Required(CONF_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/aquostv/media_player.py

@@ -39,7 +39,7 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
         probatio.Optional(CONF_PASSWORD, default=DEFAULT_PASSWORD): cv.string,
         probatio.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.string,

homeassistant/components/asuswrt/config_flow.py

@@ -24,7 +24,6 @@ from homeassistant.const import (
 )
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import SectionConfig, section
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.schema_config_entry_flow import (
     SchemaCommonFlowHandler,
     SchemaFlowFormStep,
@@ -157,7 +156,7 @@ class AsusWrtFlowHandler(ConfigFlow, domain=DOMAIN):
             probatio.Required(CONF_MORE_OPTIONS): section(
                 probatio.Schema(
                     {
-                        probatio.Optional(CONF_PORT): cv.port,
+                        probatio.Optional(CONF_PORT): probatio.Port(),
                         probatio.Optional(CONF_SSH_KEY): str,
                     }
                 ),

homeassistant/components/ccm15/config_flow.py

@@ -8,7 +8,6 @@ import probatio
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.httpx_client import get_async_client
 
 from .const import DEFAULT_TIMEOUT, DOMAIN
@@ -18,7 +17,7 @@ _LOGGER = logging.getLogger(__name__)
 STEP_USER_DATA_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): str,
-        probatio.Optional(CONF_PORT, default=80): cv.port,
+        probatio.Optional(CONF_PORT, default=80): probatio.Port(),
     }
 )
 

homeassistant/components/channels/media_player.py

@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/cisco_ios/device_tracker.py

@@ -24,7 +24,7 @@ PLATFORM_SCHEMA = probatio.All(
             probatio.Required(CONF_HOST): cv.string,
             probatio.Required(CONF_USERNAME): cv.string,
             probatio.Optional(CONF_PASSWORD, default=""): cv.string,
-            probatio.Optional(CONF_PORT): cv.port,
+            probatio.Optional(CONF_PORT): probatio.Port(),
         }
     )
 )

homeassistant/components/cmus/media_player.py

@@ -28,7 +28,7 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         probatio.Inclusive(CONF_HOST, "remote"): cv.string,
         probatio.Inclusive(CONF_PASSWORD, "remote"): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     }
 )

homeassistant/components/comelit/config_flow.py

@@ -29,7 +29,7 @@ DEFAULT_PIN = "111111"
 USER_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST, default=DEFAULT_HOST): cv.string,
-        probatio.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Required(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_PIN, default=DEFAULT_PIN): cv.string,
         probatio.Required(CONF_TYPE, default=BRIDGE): probatio.In(DEVICE_TYPE_LIST),
         probatio.Optional(CONF_VEDO_PIN): cv.string,
@@ -238,7 +238,7 @@ class ComelitConfigFlow(ConfigFlow, domain=DOMAIN):
                 ): cv.string,
                 probatio.Required(
                     CONF_PORT, default=reconfigure_entry.data[CONF_PORT]
-                ): cv.port,
+                ): probatio.Port(),
                 probatio.Optional(CONF_PIN): cv.string,
                 probatio.Optional(CONF_VEDO_PIN): cv.string,
             }

homeassistant/components/concord232/alarm_control_panel.py

@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = ALARM_CONTROL_PANEL_PLATFORM_SCHEMA.extend(
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
         probatio.Optional(CONF_CODE): cv.string,
         probatio.Optional(CONF_MODE, default=DEFAULT_MODE): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/concord232/binary_sensor.py

@@ -42,7 +42,7 @@ PLATFORM_SCHEMA = BINARY_SENSOR_PLATFORM_SCHEMA.extend(
             probatio.EnsureList(), [cv.positive_int]
         ),
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_ZONE_TYPES, default={}): ZONE_TYPES_SCHEMA,
     }
 )

homeassistant/components/debugpy/__init__.py

@@ -23,7 +23,7 @@ CONFIG_SCHEMA = probatio.Schema(
         DOMAIN: probatio.Schema(
             {
                 probatio.Optional(CONF_HOST, default="0.0.0.0"): cv.string,
-                probatio.Optional(CONF_PORT, default=5678): cv.port,
+                probatio.Optional(CONF_PORT, default=5678): probatio.Port(),
                 probatio.Optional(CONF_START, default=True): cv.boolean,
                 probatio.Optional(CONF_WAIT, default=False): cv.boolean,
             }

homeassistant/components/dlna_dmr/config_flow.py

@@ -388,7 +388,7 @@ class DlnaDmrOptionsFlowHandler(OptionsFlow):
                 ] = validator
 
         # listen_port can be blank or 0 for "bind any free port"
-        _add_with_suggestion(CONF_LISTEN_PORT, cv.port)
+        _add_with_suggestion(CONF_LISTEN_PORT, probatio.Port())
         _add_with_suggestion(CONF_CALLBACK_URL_OVERRIDE, str)
         _add_with_suggestion(CONF_POLL_AVAILABILITY, bool)
         _add_with_suggestion(CONF_BROWSE_UNFILTERED, bool)

homeassistant/components/dnsip/config_flow.py

@@ -43,9 +43,9 @@ DATA_SCHEMA = probatio.Schema(
             probatio.Schema(
                 {
                     probatio.Optional(CONF_RESOLVER): cv.string,
-                    probatio.Optional(CONF_PORT): cv.port,
+                    probatio.Optional(CONF_PORT): probatio.Port(),
                     probatio.Optional(CONF_RESOLVER_IPV6): cv.string,
-                    probatio.Optional(CONF_PORT_IPV6): cv.port,
+                    probatio.Optional(CONF_PORT_IPV6): probatio.Port(),
                 }
             ),
             SectionConfig(collapsed=True),
@@ -216,9 +216,9 @@ class DnsIPOptionsFlowHandler(OptionsFlowWithReload):
             probatio.Schema(
                 {
                     probatio.Optional(CONF_RESOLVER): cv.string,
-                    probatio.Optional(CONF_PORT): cv.port,
+                    probatio.Optional(CONF_PORT): probatio.Port(),
                     probatio.Optional(CONF_RESOLVER_IPV6): cv.string,
-                    probatio.Optional(CONF_PORT_IPV6): cv.port,
+                    probatio.Optional(CONF_PORT_IPV6): probatio.Port(),
                 }
             ),
             self.config_entry.options,

homeassistant/components/ebusd/__init__.py

@@ -45,7 +45,7 @@ CONFIG_SCHEMA = probatio.Schema(
                 {
                     probatio.Required(CONF_CIRCUIT): cv.string,
                     probatio.Required(CONF_HOST): cv.string,
-                    probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                    probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
                     probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
                     probatio.Optional(
                         CONF_MONITORED_CONDITIONS, default=[]

homeassistant/components/egardia/__init__.py

@@ -66,7 +66,7 @@ CONFIG_SCHEMA = probatio.Schema(
                 probatio.Required(CONF_USERNAME): cv.string,
                 probatio.Optional(CONF_VERSION, default=DEFAULT_VERSION): cv.string,
                 probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-                probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
                 probatio.Optional(
                     CONF_REPORT_SERVER_CODES, default={}
                 ): SERVER_CODE_SCHEMA,
@@ -75,7 +75,7 @@ CONFIG_SCHEMA = probatio.Schema(
                 ): cv.boolean,
                 probatio.Optional(
                     CONF_REPORT_SERVER_PORT, default=DEFAULT_REPORT_SERVER_PORT
-                ): cv.port,
+                ): probatio.Port(),
             }
         )
     },

homeassistant/components/emby/media_player.py

@@ -49,7 +49,7 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_API_KEY): cv.string,
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-        probatio.Optional(CONF_PORT): cv.port,
+        probatio.Optional(CONF_PORT): probatio.Port(),
         probatio.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
     }
 )

homeassistant/components/emulated_hue/__init__.py

@@ -68,9 +68,9 @@ CONFIG_SCHEMA = probatio.Schema(
                 probatio.Optional(CONF_HOST_IP): cv.string,
                 probatio.Optional(
                     CONF_LISTEN_PORT, default=DEFAULT_LISTEN_PORT
-                ): cv.port,
+                ): probatio.Port(),
                 probatio.Optional(CONF_ADVERTISE_IP): cv.string,
-                probatio.Optional(CONF_ADVERTISE_PORT): cv.port,
+                probatio.Optional(CONF_ADVERTISE_PORT): probatio.Port(),
                 probatio.Optional(CONF_UPNP_BIND_MULTICAST): cv.boolean,
                 probatio.Optional(CONF_OFF_MAPS_TO_ON_DOMAINS): probatio.EnsureList(),
                 probatio.Optional(CONF_EXPOSE_BY_DEFAULT): cv.boolean,

homeassistant/components/emulated_roku/__init__.py

@@ -25,10 +25,10 @@ from .const import (
 SERVER_CONFIG_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_NAME): cv.string,
-        probatio.Required(CONF_LISTEN_PORT): cv.port,
+        probatio.Required(CONF_LISTEN_PORT): probatio.Port(),
         probatio.Optional(CONF_HOST_IP): cv.string,
         probatio.Optional(CONF_ADVERTISE_IP): cv.string,
-        probatio.Optional(CONF_ADVERTISE_PORT): cv.port,
+        probatio.Optional(CONF_ADVERTISE_PORT): probatio.Port(),
         probatio.Optional(CONF_UPNP_BIND_MULTICAST): cv.boolean,
     }
 )

homeassistant/components/envertech_evt800/config_flow.py

@@ -14,7 +14,7 @@ from .const import DEFAULT_PORT, DOMAIN, TYPE_TCP_SERVER_MODE
 SCHEMA_DEVICE = probatio.Schema(
     {
         probatio.Required(CONF_IP_ADDRESS): cv.string,
-        probatio.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Required(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/envisalink/__init__.py

@@ -81,7 +81,7 @@ CONFIG_SCHEMA = probatio.Schema(
                 probatio.Optional(CONF_PARTITIONS): {
                     probatio.Coerce(int): PARTITION_SCHEMA
                 },
-                probatio.Optional(CONF_EVL_PORT, default=DEFAULT_PORT): cv.port,
+                probatio.Optional(CONF_EVL_PORT, default=DEFAULT_PORT): probatio.Port(),
                 probatio.Optional(
                     CONF_EVL_VERSION, default=DEFAULT_EVL_VERSION
                 ): probatio.All(probatio.Coerce(int), probatio.Range(min=3, max=4)),

homeassistant/components/fivem/config_flow.py

@@ -19,7 +19,7 @@ DEFAULT_PORT = 30120
 STEP_USER_DATA_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/flic/binary_sensor.py

@@ -46,7 +46,7 @@ EVENT_DATA_QUEUED_TIME = "queued_time"
 PLATFORM_SCHEMA = BINARY_SENSOR_PLATFORM_SCHEMA.extend(
     {
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_DISCOVERY, default=True): cv.boolean,
         probatio.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
         probatio.Optional(CONF_IGNORED_CLICK_TYPES): probatio.All(

homeassistant/components/futurenow/light.py

@@ -33,7 +33,7 @@ PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_DRIVER): probatio.In(CONF_DRIVER_TYPES),
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Required(CONF_PORT): cv.port,
+        probatio.Required(CONF_PORT): probatio.Port(),
         probatio.Required(CONF_DEVICES): {cv.string: DEVICE_SCHEMA},
     }
 )

homeassistant/components/gc100/__init__.py

@@ -21,7 +21,7 @@ CONFIG_SCHEMA = probatio.Schema(
         DOMAIN: probatio.Schema(
             {
                 probatio.Required(CONF_HOST): cv.string,
-                probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
             }
         )
     },

homeassistant/components/gpsd/config_flow.py

@@ -8,14 +8,13 @@ import probatio
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
-from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN
 
 STEP_USER_DATA_SCHEMA = probatio.Schema(
     {
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): str,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/graphite/__init__.py

@@ -38,7 +38,7 @@ CONFIG_SCHEMA = probatio.Schema(
         DOMAIN: probatio.Schema(
             {
                 probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-                probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
                 probatio.Optional(
                     CONF_PROTOCOL, default=DEFAULT_PROTOCOL
                 ): probatio.Any(PROTOCOL_TCP, PROTOCOL_UDP),

homeassistant/components/greeneye_monitor/__init__.py

@@ -117,7 +117,7 @@ MONITORS_SCHEMA = probatio.All(probatio.EnsureList(), [MONITOR_SCHEMA])
 
 COMPONENT_SCHEMA = probatio.Schema(
     {
-        probatio.Required(CONF_PORT): cv.port,
+        probatio.Required(CONF_PORT): probatio.Port(),
         probatio.Required(CONF_MONITORS): MONITORS_SCHEMA,
     }
 )

homeassistant/components/guardian/services.py

@@ -49,7 +49,7 @@ SERVICE_UPGRADE_FIRMWARE_SCHEMA = probatio.Schema(
     {
         probatio.Required(ATTR_DEVICE_ID): cv.string,
         probatio.Optional(CONF_URL): cv.url,
-        probatio.Optional(CONF_PORT): cv.port,
+        probatio.Optional(CONF_PORT): probatio.Port(),
         probatio.Optional(CONF_FILENAME): cv.string,
     },
 )

homeassistant/components/harman_kardon_avr/media_player.py

@@ -24,7 +24,7 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/hddtemp/sensor.py

@@ -43,7 +43,7 @@ PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
             probatio.EnsureList(), [cv.string]
         ),
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     }
 )

homeassistant/components/hikvision/binary_sensor.py

@@ -171,7 +171,7 @@ PLATFORM_SCHEMA = BINARY_SENSOR_PLATFORM_SCHEMA.extend(
     {
         probatio.Optional(CONF_NAME): cv.string,
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_SSL, default=False): cv.boolean,
         probatio.Required(CONF_USERNAME): cv.string,
         probatio.Required(CONF_PASSWORD): cv.string,

homeassistant/components/hikvisioncam/switch.py

@@ -37,7 +37,7 @@ PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
         probatio.Optional(CONF_PASSWORD, default=DEFAULT_PASSWORD): cv.string,
-        probatio.Optional(CONF_PORT): cv.port,
+        probatio.Optional(CONF_PORT): probatio.Port(),
         probatio.Optional(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
     }
 )

homeassistant/components/hlk_sw16/__init__.py

@@ -39,7 +39,9 @@ CONFIG_SCHEMA = probatio.Schema(
                 cv.string: probatio.Schema(
                     {
                         probatio.Required(CONF_HOST): cv.string,
-                        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                        probatio.Optional(
+                            CONF_PORT, default=DEFAULT_PORT
+                        ): probatio.Port(),
                         probatio.Required(CONF_SWITCHES): probatio.Schema(
                             {RELAY_ID: SWITCH_SCHEMA}
                         ),

homeassistant/components/homekit/__init__.py

@@ -205,7 +205,7 @@ BRIDGE_SCHEMA = probatio.All(
             probatio.Optional(CONF_NAME, default=BRIDGE_NAME): probatio.All(
                 cv.string, probatio.Length(min=3, max=25)
             ),
-            probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+            probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
             probatio.Optional(CONF_IP_ADDRESS): probatio.All(
                 ipaddress.ip_address, cv.string
             ),

homeassistant/components/homematic/__init__.py

@@ -120,14 +120,16 @@ CONFIG_SCHEMA = probatio.Schema(
                 probatio.Optional(CONF_INTERFACES, default={}): {
                     cv.match_all: {
                         probatio.Required(CONF_HOST): cv.string,
-                        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                        probatio.Optional(
+                            CONF_PORT, default=DEFAULT_PORT
+                        ): probatio.Port(),
                         probatio.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string,
                         probatio.Optional(
                             CONF_RESOLVENAMES, default=DEFAULT_RESOLVENAMES
                         ): probatio.In(CONF_RESOLVENAMES_OPTIONS),
                         probatio.Optional(
                             CONF_JSONPORT, default=DEFAULT_JSONPORT
-                        ): cv.port,
+                        ): probatio.Port(),
                         probatio.Optional(
                             CONF_USERNAME, default=DEFAULT_USERNAME
                         ): cv.string,
@@ -135,7 +137,7 @@ CONFIG_SCHEMA = probatio.Schema(
                             CONF_PASSWORD, default=DEFAULT_PASSWORD
                         ): cv.string,
                         probatio.Optional(CONF_CALLBACK_IP): cv.string,
-                        probatio.Optional(CONF_CALLBACK_PORT): cv.port,
+                        probatio.Optional(CONF_CALLBACK_PORT): probatio.Port(),
                         probatio.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
                         probatio.Optional(
                             CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL
@@ -145,7 +147,9 @@ CONFIG_SCHEMA = probatio.Schema(
                 probatio.Optional(CONF_HOSTS, default={}): {
                     cv.match_all: {
                         probatio.Required(CONF_HOST): cv.string,
-                        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                        probatio.Optional(
+                            CONF_PORT, default=DEFAULT_PORT
+                        ): probatio.Port(),
                         probatio.Optional(
                             CONF_USERNAME, default=DEFAULT_USERNAME
                         ): cv.string,
@@ -155,7 +159,7 @@ CONFIG_SCHEMA = probatio.Schema(
                     }
                 },
                 probatio.Optional(CONF_LOCAL_IP, default=DEFAULT_LOCAL_IP): cv.string,
-                probatio.Optional(CONF_LOCAL_PORT): cv.port,
+                probatio.Optional(CONF_LOCAL_PORT): probatio.Port(),
             }
         )
     },

homeassistant/components/horizon/media_player.py

@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/hp_ilo/sensor.py

@@ -69,7 +69,7 @@ PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
             ],
         ),
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/http/__init__.py

@@ -77,7 +77,7 @@ HTTP_SCHEMA: Final = probatio.All(
             # No default: the YAML migration needs to tell an explicitly
             # configured port apart from an omitted one, which it keeps on the
             # previous default port instead of the Supervisor default.
-            probatio.Optional(CONF_SERVER_PORT): cv.port,
+            probatio.Optional(CONF_SERVER_PORT): probatio.Port(),
             probatio.Optional(CONF_BASE_URL): cv.string,
             probatio.Optional(CONF_SSL_CERTIFICATE): cv.isfile,
             probatio.Optional(CONF_SSL_PEER_CERTIFICATE): cv.isfile,

homeassistant/components/http/config.py

@@ -59,7 +59,7 @@ def default_server_port() -> int:
     if (env_value := os.environ.get(ENV_SETUP_PORT)) is None:
         return default
     try:
-        return cv.port(env_value)
+        return probatio.Port()(env_value)
     except probatio.Invalid:
         _LOGGER.warning(
             "Invalid port %r in %s environment variable; falling back to %s",
@@ -143,7 +143,9 @@ HTTP_STORAGE_SCHEMA: Final = probatio.Schema(
         probatio.Optional(CONF_SERVER_HOST): probatio.All(
             probatio.EnsureList(), probatio.Length(min=1), [cv.string]
         ),
-        probatio.Optional(CONF_SERVER_PORT, default=default_server_port): cv.port,
+        probatio.Optional(
+            CONF_SERVER_PORT, default=default_server_port
+        ): probatio.Port(),
         probatio.Optional(CONF_SSL_CERTIFICATE): cv.isfile,
         probatio.Optional(CONF_SSL_PEER_CERTIFICATE): cv.isfile,
         probatio.Optional(CONF_SSL_KEY): cv.isfile,

homeassistant/components/iammeter/sensor.py

@@ -53,7 +53,7 @@ PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_DEVICE_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/idteck_prox/__init__.py

@@ -29,7 +29,7 @@ CONFIG_SCHEMA = probatio.Schema(
                 probatio.Schema(
                     {
                         probatio.Required(CONF_HOST): cv.string,
-                        probatio.Required(CONF_PORT): cv.port,
+                        probatio.Required(CONF_PORT): probatio.Port(),
                         probatio.Required(CONF_NAME): cv.string,
                     }
                 )

homeassistant/components/iglo/light.py

@@ -30,7 +30,7 @@ PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/imap/config_flow.py

@@ -70,7 +70,7 @@ CONFIG_SCHEMA = probatio.Schema(
         probatio.Required(CONF_USERNAME): str,
         probatio.Required(CONF_PASSWORD): str,
         probatio.Required(CONF_SERVER): str,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_CHARSET, default="utf-8"): str,
         probatio.Optional(CONF_FOLDER, default="INBOX"): str,
         probatio.Optional(CONF_SEARCH, default="UnSeen UnDeleted"): str,

homeassistant/components/influxdb/const.py

@@ -140,7 +140,7 @@ COMPONENT_CONFIG_SCHEMA_CONNECTION = {
     ),
     probatio.Optional(CONF_HOST): cv.string,
     probatio.Optional(CONF_PATH): cv.string,
-    probatio.Optional(CONF_PORT): cv.port,
+    probatio.Optional(CONF_PORT): probatio.Port(),
     probatio.Optional(CONF_SSL): cv.boolean,
     probatio.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
     probatio.Optional(CONF_SSL_CA_CERT): cv.isfile,

homeassistant/components/iperf3/__init__.py

@@ -73,7 +73,7 @@ PROTOCOLS = ["tcp", "udp"]
 HOST_CONFIG_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_DURATION, default=DEFAULT_DURATION): probatio.Range(
             5, 10
         ),

homeassistant/components/itach/remote.py

@@ -46,7 +46,7 @@ PLATFORM_SCHEMA = REMOTE_PLATFORM_SCHEMA.extend(
     {
         probatio.Optional(CONF_MAC): cv.string,
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Required(CONF_DEVICES): probatio.All(
             probatio.EnsureList(),
             [

homeassistant/components/itunes/media_player.py

@@ -29,7 +29,7 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
     }
 )

homeassistant/components/kankun/switch.py

@@ -33,7 +33,7 @@ SWITCH_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string,
         probatio.Optional(CONF_USERNAME): cv.string,
         probatio.Optional(CONF_PASSWORD): cv.string,

homeassistant/components/kef/media_player.py

@@ -62,7 +62,7 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Required(CONF_TYPE): probatio.In(["LS50", "LSX"]),
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
         probatio.Optional(CONF_MAX_VOLUME, default=DEFAULT_MAX_VOLUME): cv.small_float,
         probatio.Optional(

homeassistant/components/kira/__init__.py

@@ -51,7 +51,7 @@ SENSOR_SCHEMA = probatio.Schema(
     {
         probatio.Optional(CONF_NAME, default=DOMAIN): cv.string,
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 
@@ -59,7 +59,7 @@ REMOTE_SCHEMA = probatio.Schema(
     {
         probatio.Optional(CONF_NAME, default=DOMAIN): cv.string,
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/kodi/notify.py

@@ -39,7 +39,7 @@ DEFAULT_TIMEOUT = 5
 PLATFORM_SCHEMA = NOTIFY_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_PROXY_SSL, default=DEFAULT_PROXY_SSL): cv.boolean,
         probatio.Inclusive(CONF_USERNAME, "auth"): cv.string,
         probatio.Inclusive(CONF_PASSWORD, "auth"): cv.string,

homeassistant/components/kwb/sensor.py

@@ -44,7 +44,7 @@ ETHERNET_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
         probatio.Optional(CONF_RAW, default=DEFAULT_RAW): cv.boolean,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Required(CONF_PORT): cv.port,
+        probatio.Required(CONF_PORT): probatio.Port(),
         probatio.Required(CONF_TYPE): "tcp",
     }
 )

homeassistant/components/lifx/__init__.py

@@ -26,7 +26,7 @@ CONF_BROADCAST = "broadcast"
 INTERFACE_SCHEMA = probatio.Schema(
     {
         probatio.Optional(CONF_SERVER): cv.string,
-        probatio.Optional(CONF_PORT): cv.port,
+        probatio.Optional(CONF_PORT): probatio.Port(),
         probatio.Optional(CONF_BROADCAST): cv.string,
     }
 )

homeassistant/components/lightwave/__init__.py

@@ -51,7 +51,7 @@ CONFIG_SCHEMA = probatio.Schema(
                     probatio.Optional(CONF_TRV, default={}): {
                         probatio.Optional(
                             CONF_PROXY_PORT, default=DEFAULT_PROXY_PORT
-                        ): cv.port,
+                        ): probatio.Port(),
                         probatio.Optional(CONF_PROXY_IP): cv.string,
                         probatio.Required(CONF_TRVS, default={}): {
                             cv.string: probatio.Schema(

homeassistant/components/limitlessled/light.py

@@ -84,7 +84,7 @@ PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
                     probatio.Optional(
                         CONF_VERSION, default=DEFAULT_VERSION
                     ): cv.positive_int,
-                    probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                    probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
                     probatio.Required(CONF_GROUPS): probatio.All(
                         probatio.EnsureList(),
                         [

homeassistant/components/lw12wifi/light.py

@@ -32,7 +32,7 @@ DEFAULT_PORT = 5000
 PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     }
 )

homeassistant/components/marytts/tts.py

@@ -34,7 +34,7 @@ MAP_MARYTTS_CODEC = {"WAVE_FILE": "wav", "AIFF_FILE": "aiff", "AU_FILE": "au"}
 PLATFORM_SCHEMA = TTS_PLATFORM_SCHEMA.extend(
     {
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_LANG, default=DEFAULT_LANG): probatio.In(
             SUPPORT_LANGUAGES
         ),

homeassistant/components/maxcube/__init__.py

@@ -30,7 +30,7 @@ CONF_GATEWAYS = "gateways"
 CONFIG_GATEWAY = probatio.Schema(
     {
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_SCAN_INTERVAL, default=300): cv.time_period,
     }
 )

homeassistant/components/mfi/sensor.py

@@ -50,7 +50,7 @@ PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
         probatio.Required(CONF_HOST): cv.string,
         probatio.Required(CONF_USERNAME): cv.string,
         probatio.Required(CONF_PASSWORD): cv.string,
-        probatio.Optional(CONF_PORT): cv.port,
+        probatio.Optional(CONF_PORT): probatio.Port(),
         probatio.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
         probatio.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
     }

homeassistant/components/mfi/switch.py

@@ -36,7 +36,7 @@ PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
         probatio.Required(CONF_HOST): cv.string,
         probatio.Required(CONF_USERNAME): cv.string,
         probatio.Required(CONF_PASSWORD): cv.string,
-        probatio.Optional(CONF_PORT): cv.port,
+        probatio.Optional(CONF_PORT): probatio.Port(),
         probatio.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
         probatio.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
     }

homeassistant/components/minio/__init__.py

@@ -45,7 +45,7 @@ CONFIG_SCHEMA = probatio.Schema(
         DOMAIN: probatio.Schema(
             {
                 probatio.Required(CONF_HOST): cv.string,
-                probatio.Required(CONF_PORT): cv.port,
+                probatio.Required(CONF_PORT): probatio.Port(),
                 probatio.Required(CONF_ACCESS_KEY): cv.string,
                 probatio.Required(CONF_SECRET_KEY): cv.string,
                 probatio.Required(CONF_SECURE): cv.boolean,

homeassistant/components/mochad/__init__.py

@@ -29,7 +29,7 @@ CONFIG_SCHEMA = probatio.Schema(
         DOMAIN: probatio.Schema(
             {
                 probatio.Optional(CONF_HOST, default="localhost"): cv.string,
-                probatio.Optional(CONF_PORT, default=1099): cv.port,
+                probatio.Optional(CONF_PORT, default=1099): probatio.Port(),
             }
         )
     },

homeassistant/components/modbus/schemas.py

@@ -539,7 +539,7 @@ SERIAL_SCHEMA = MODBUS_SCHEMA.extend(
 ETHERNET_SCHEMA = MODBUS_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Required(CONF_PORT): cv.port,
+        probatio.Required(CONF_PORT): probatio.Port(),
         probatio.Required(CONF_TYPE): probatio.Any(TCP, UDP, RTUOVERTCP),
     }
 )

homeassistant/components/mpd/media_player.py

@@ -60,7 +60,7 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
         probatio.Optional(CONF_PASSWORD): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/ness_alarm/__init__.py

@@ -68,7 +68,7 @@ CONFIG_SCHEMA = probatio.Schema(
         DOMAIN: probatio.Schema(
             {
                 probatio.Required(CONF_HOST): cv.string,
-                probatio.Required(CONF_PORT): cv.port,
+                probatio.Required(CONF_PORT): probatio.Port(),
                 probatio.Optional(
                     CONF_SCAN_INTERVAL, default=DEFAULT_SCAN_INTERVAL
                 ): cv.positive_time_period,

homeassistant/components/ness_alarm/config_flow.py

@@ -20,7 +20,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.const import CONF_HOST, CONF_PORT, CONF_TYPE
 from homeassistant.core import callback
-from homeassistant.helpers import config_validation as cv, selector
+from homeassistant.helpers import selector
 
 from .const import (
     CONF_INFER_ARMING_STATE,
@@ -44,7 +44,7 @@ _LOGGER = logging.getLogger(__name__)
 STEP_USER_DATA_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): str,
-        probatio.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Required(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(
             CONF_INFER_ARMING_STATE, default=DEFAULT_INFER_ARMING_STATE
         ): bool,

homeassistant/components/netdata/sensor.py

@@ -51,7 +51,7 @@ PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
     {
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Required(CONF_RESOURCES): probatio.Schema(
             {cv.string: RESOURCE_SCHEMA}
         ),

homeassistant/components/netio/config_flow.py

@@ -16,7 +16,6 @@ from homeassistant.const import (
     CONF_USERNAME,
     CONF_VERIFY_SSL,
 )
-from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN
 from .coordinator import create_device
@@ -28,7 +27,7 @@ DEFAULT_PORT = 80
 STEP_USER_DATA_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): str,
-        probatio.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Required(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Required(CONF_USERNAME): str,
         probatio.Required(CONF_PASSWORD): str,
         probatio.Required(CONF_SSL, default=False): bool,

homeassistant/components/netio/switch.py

@@ -57,7 +57,7 @@ URL_API_NETIO_EP = "/api/netio/{host}"
 PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Required(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Required(CONF_USERNAME, default=DEFAULT_USERNAME): cv.string,
         probatio.Required(CONF_PASSWORD): cv.string,
         probatio.Optional(CONF_OUTLETS): {cv.string: cv.string},

homeassistant/components/nx584/alarm_control_panel.py

@@ -37,7 +37,7 @@ PLATFORM_SCHEMA = ALARM_CONTROL_PANEL_PLATFORM_SCHEMA.extend(
     {
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/nx584/binary_sensor.py

@@ -40,7 +40,7 @@ PLATFORM_SCHEMA = BINARY_SENSOR_PLATFORM_SCHEMA.extend(
             probatio.EnsureList(), [cv.positive_int]
         ),
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_ZONE_TYPES, default={}): ZONE_TYPES_SCHEMA,
     }
 )

homeassistant/components/octoprint/__init__.py

@@ -105,7 +105,7 @@ CONFIG_SCHEMA = probatio.Schema(
                             probatio.Required(CONF_API_KEY): cv.string,
                             probatio.Required(CONF_HOST): cv.string,
                             probatio.Optional(CONF_SSL, default=False): cv.boolean,
-                            probatio.Optional(CONF_PORT, default=80): cv.port,
+                            probatio.Optional(CONF_PORT, default=80): probatio.Port(),
                             probatio.Optional(
                                 CONF_PATH, default="/"
                             ): ensure_valid_path,

homeassistant/components/octoprint/config_flow.py

@@ -22,7 +22,6 @@ from homeassistant.const import (
 )
 from homeassistant.data_entry_flow import AbortFlow
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.service_info.ssdp import SsdpServiceInfo
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 from homeassistant.util.ssl import get_default_context, get_default_no_verify_context
@@ -39,7 +38,7 @@ def _schema_with_defaults(
         {
             probatio.Required(CONF_USERNAME, default=username): str,
             probatio.Required(CONF_HOST, default=host): str,
-            probatio.Required(CONF_PORT, default=port): cv.port,
+            probatio.Required(CONF_PORT, default=port): probatio.Port(),
             probatio.Required(CONF_PATH, default=path): str,
             probatio.Required(CONF_SSL, default=ssl): bool,
             probatio.Required(CONF_VERIFY_SSL, default=verify_ssl): bool,

homeassistant/components/oem/climate.py

@@ -31,7 +31,7 @@ PLATFORM_SCHEMA = CLIMATE_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default="Thermostat"): cv.string,
-        probatio.Optional(CONF_PORT, default=80): cv.port,
+        probatio.Optional(CONF_PORT, default=80): probatio.Port(),
         probatio.Inclusive(CONF_USERNAME, "authentication"): cv.string,
         probatio.Inclusive(CONF_PASSWORD, "authentication"): cv.string,
     }

homeassistant/components/ombi/__init__.py

@@ -72,7 +72,7 @@ CONFIG_SCHEMA = probatio.Schema(
                     probatio.Required(CONF_USERNAME): cv.string,
                     probatio.Exclusive(CONF_API_KEY, "auth"): cv.string,
                     probatio.Exclusive(CONF_PASSWORD, "auth"): cv.string,
-                    probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                    probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
                     probatio.Optional(CONF_URLBASE, default=DEFAULT_URLBASE): urlbase,
                     probatio.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
                 }

homeassistant/components/openhardwaremonitor/sensor.py

@@ -41,7 +41,7 @@ OHM_NAME = "Text"
 PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=8085): cv.port,
+        probatio.Optional(CONF_PORT, default=8085): probatio.Port(),
     }
 )
 

homeassistant/components/openrgb/config_flow.py

@@ -9,7 +9,6 @@ import probatio
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
 
 from .const import CONNECTION_ERRORS, DEFAULT_CLIENT_NAME, DEFAULT_PORT, DOMAIN
 
@@ -21,14 +20,14 @@ STEP_USER_DATA_SCHEMA = probatio.Schema(
         # pylint: disable-next=home-assistant-config-flow-name-field
         probatio.Required(CONF_NAME): str,
         probatio.Required(CONF_HOST): str,
-        probatio.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Required(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 
 STEP_RECONFIGURE_DATA_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): str,
-        probatio.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Required(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/panasonic_viera/__init__.py

@@ -41,7 +41,9 @@ CONFIG_SCHEMA = probatio.Schema(
                     {
                         probatio.Required(CONF_HOST): cv.string,
                         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-                        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                        probatio.Optional(
+                            CONF_PORT, default=DEFAULT_PORT
+                        ): probatio.Port(),
                         probatio.Optional(CONF_ON_ACTION): cv.SCRIPT_SCHEMA,
                     }
                 )

homeassistant/components/pencom/switch.py

@@ -35,7 +35,7 @@ RELAY_SCHEMA = probatio.Schema(
 PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Required(CONF_PORT): cv.port,
+        probatio.Required(CONF_PORT): probatio.Port(),
         probatio.Optional(CONF_BOARDS, default=1): cv.positive_int,
         probatio.Required(CONF_RELAYS): probatio.All(
             probatio.EnsureList(), [RELAY_SCHEMA]

homeassistant/components/pilight/__init__.py

@@ -56,7 +56,7 @@ CONFIG_SCHEMA = probatio.Schema(
         DOMAIN: probatio.Schema(
             {
                 probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-                probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
                 probatio.Optional(CONF_WHITELIST, default={}): {cv.string: [cv.string]},
                 probatio.Optional(
                     CONF_SEND_DELAY, default=DEFAULT_SEND_DELAY

homeassistant/components/pioneer/media_player.py

@@ -35,7 +35,7 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.socket_timeout,
         probatio.Optional(CONF_SOURCES, default=DEFAULT_SOURCES): {
             cv.string: cv.string

homeassistant/components/pjlink/config_flow.py

@@ -9,7 +9,6 @@ from pypjlink.projector import ProjectorError
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
-from homeassistant.helpers import config_validation as cv
 
 from .const import DEFAULT_PORT, DOMAIN
 
@@ -18,7 +17,7 @@ _LOGGER = logging.getLogger(__name__)
 STEP_USER_DATA_SCHEMA = probatio.Schema(
     {
         probatio.Required(CONF_HOST): str,
-        probatio.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Required(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_PASSWORD): str,
     }
 )

homeassistant/components/pjlink/media_player.py

@@ -32,7 +32,7 @@ ERR_PROJECTOR_UNAVAILABLE = "projector unavailable"
 PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
     {
         probatio.Required(CONF_HOST): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Optional(CONF_NAME): cv.string,
         probatio.Optional(CONF_ENCODING, default=DEFAULT_ENCODING): cv.string,
         probatio.Optional(CONF_PASSWORD): cv.string,

homeassistant/components/proxmoxve/config_flow.py

@@ -64,7 +64,7 @@ BASE_SCHEMA = probatio.Schema(
         probatio.Required(CONF_USERNAME): TextSelector(
             TextSelectorConfig(type=TextSelectorType.TEXT, autocomplete="username")
         ),
-        probatio.Required(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Required(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
         probatio.Required(CONF_TOKEN, default=False): cv.boolean,
         probatio.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
     }

homeassistant/components/pulseaudio_loopback/switch.py

@@ -34,7 +34,7 @@ PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
         probatio.Required(CONF_SOURCE_NAME): cv.string,
         probatio.Optional(CONF_HOST): cv.string,
         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/qnap/config_flow.py

@@ -33,7 +33,7 @@ DATA_SCHEMA = probatio.Schema(
         probatio.Required(CONF_PASSWORD): cv.string,
         probatio.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
         probatio.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
-        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+        probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
     }
 )
 

homeassistant/components/qvr_pro/__init__.py

@@ -39,7 +39,7 @@ CONFIG_SCHEMA = probatio.Schema(
                 probatio.Required(CONF_HOST): cv.string,
                 probatio.Required(CONF_USERNAME): cv.string,
                 probatio.Required(CONF_PASSWORD): cv.string,
-                probatio.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                probatio.Optional(CONF_PORT, default=DEFAULT_PORT): probatio.Port(),
                 probatio.Optional(CONF_EXCLUDE_CHANNELS, default=[]): probatio.All(
                     cv.ensure_list_csv, [cv.positive_int]
                 ),

homeassistant/components/raspyrfm/switch.py

@@ -42,7 +42,7 @@ DEFAULT_HOST = "127.0.0.1"
 PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
     {
         probatio.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
-        probatio.Optional(CONF_PORT): cv.port,
+        probatio.Optional(CONF_PORT): probatio.Port(),
         probatio.Optional(CONF_GATEWAY_MANUFACTURER): cv.string,
         probatio.Optional(CONF_GATEWAY_MODEL): cv.string,
         probatio.Required(CONF_SWITCHES): probatio.Schema(

homeassistant/components/reolink/config_flow.py

@@ -32,7 +32,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import callback
 from homeassistant.data_entry_flow import AbortFlow
-from homeassistant.helpers import config_validation as cv, selector
+from homeassistant.helpers import selector
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
@@ -367,9 +367,11 @@ class ReolinkFlowHandler(ConfigFlow, domain=DOMAIN):
         if errors:
             data_schema = data_schema.extend(
                 {
-                    probatio.Optional(CONF_PORT): cv.port,
+                    probatio.Optional(CONF_PORT): probatio.Port(),
                     probatio.Required(CONF_USE_HTTPS, default=False): bool,
-                    probatio.Required(CONF_BC_PORT, default=DEFAULT_BC_PORT): cv.port,
+                    probatio.Required(
+                        CONF_BC_PORT, default=DEFAULT_BC_PORT
+                    ): probatio.Port(),
                 }
             )
 

homeassistant/components/repetier/__init__.py

@@ -204,7 +204,7 @@ CONFIG_SCHEMA = probatio.Schema(
                     {
                         probatio.Required(CONF_API_KEY): cv.string,
                         probatio.Required(CONF_HOST): cv.string,
-                        probatio.Optional(CONF_PORT, default=3344): cv.port,
+                        probatio.Optional(CONF_PORT, default=3344): probatio.Port(),
                         probatio.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
                         probatio.Optional(CONF_SENSORS, default={}): SENSOR_SCHEMA,
                     }

homeassistant/components/rflink/__init__.py

@@ -101,7 +101,7 @@ CONFIG_SCHEMA = probatio.Schema(
     {
         DOMAIN: probatio.Schema(
             {
-                probatio.Required(CONF_PORT): probatio.Any(cv.port, cv.string),
+                probatio.Required(CONF_PORT): probatio.Any(probatio.Port(), cv.string),
                 probatio.Optional(CONF_HOST): cv.string,
                 probatio.Optional(CONF_WAIT_FOR_ACK, default=True): cv.boolean,
                 probatio.Optional(