From 132bb7902a74bf6ac2724a114c581f901760424e Mon Sep 17 00:00:00 2001
From: cdce8p <30130371+cdce8p@users.noreply.github.com>
Date: Sat, 10 Nov 2018 18:33:45 +0100
Subject: [PATCH] Update HAP-python to 2.4.0 (#18355)

---
 homeassistant/components/homekit/__init__.py      | 2 +-
 homeassistant/components/homekit/type_switches.py | 7 ++-----
 requirements_all.txt                              | 2 +-
 requirements_test_all.txt                         | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py
index f8514a5d030..650fff45c7b 100644
--- a/homeassistant/components/homekit/__init__.py
+++ b/homeassistant/components/homekit/__init__.py
@@ -29,7 +29,7 @@ from .const import (
 from .util import (
     show_setup_message, validate_entity_config, validate_media_player_features)
 
-REQUIREMENTS = ['HAP-python==2.2.2']
+REQUIREMENTS = ['HAP-python==2.4.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/homekit/type_switches.py b/homeassistant/components/homekit/type_switches.py
index 553d74f5a52..b41e1a01543 100644
--- a/homeassistant/components/homekit/type_switches.py
+++ b/homeassistant/components/homekit/type_switches.py
@@ -2,7 +2,8 @@
 import logging
 
 from pyhap.const import (
-    CATEGORY_OUTLET, CATEGORY_SWITCH)
+    CATEGORY_FAUCET, CATEGORY_OUTLET, CATEGORY_SHOWER_HEAD,
+    CATEGORY_SPRINKLER, CATEGORY_SWITCH)
 
 from homeassistant.components.script import ATTR_CAN_CANCEL
 from homeassistant.components.switch import DOMAIN
@@ -20,10 +21,6 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
-CATEGORY_SPRINKLER = 28
-CATEGORY_FAUCET = 29
-CATEGORY_SHOWER_HEAD = 30
-
 VALVE_TYPE = {
     TYPE_FAUCET: (CATEGORY_FAUCET, 3),
     TYPE_SHOWER: (CATEGORY_SHOWER_HEAD, 2),
diff --git a/requirements_all.txt b/requirements_all.txt
index 88b78be0011..1ec88c98fa0 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -32,7 +32,7 @@ Adafruit-SHT31==1.0.2
 # Adafruit_BBIO==1.0.0
 
 # homeassistant.components.homekit
-HAP-python==2.2.2
+HAP-python==2.4.0
 
 # homeassistant.components.notify.mastodon
 Mastodon.py==1.3.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 3a6470fa474..4011be94bb6 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -19,7 +19,7 @@ requests_mock==1.5.2
 
 
 # homeassistant.components.homekit
-HAP-python==2.2.2
+HAP-python==2.4.0
 
 # homeassistant.components.sensor.rmvtransport
 PyRMVtransport==0.1.3