From 632d44c7b7bae3a8ca6ac3fe5c3a10d161072806 Mon Sep 17 00:00:00 2001
From: Fredrik Erlandsson <fredrik.e@gmail.com>
Date: Wed, 15 Apr 2020 15:12:10 +0200
Subject: [PATCH] Fix various Daikin issues (#34249)

* various Daikin fixes

* make timeout a constant
---
 CODEOWNERS                                     | 2 +-
 homeassistant/components/daikin/__init__.py    | 3 ++-
 homeassistant/components/daikin/config_flow.py | 4 ++--
 homeassistant/components/daikin/const.py       | 2 ++
 homeassistant/components/daikin/manifest.json  | 5 ++---
 requirements_all.txt                           | 2 +-
 requirements_test_all.txt                      | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 4d4c7d3d900..3e2959cc043 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -77,7 +77,7 @@ homeassistant/components/counter/* @fabaff
 homeassistant/components/cover/* @home-assistant/core
 homeassistant/components/cpuspeed/* @fabaff
 homeassistant/components/cups/* @fabaff
-homeassistant/components/daikin/* @fredrike @rofrantz
+homeassistant/components/daikin/* @fredrike
 homeassistant/components/darksky/* @fabaff
 homeassistant/components/deconz/* @kane610
 homeassistant/components/delijn/* @bollewolle
diff --git a/homeassistant/components/daikin/__init__.py b/homeassistant/components/daikin/__init__.py
index 209bf71e594..f6384cfd4b8 100644
--- a/homeassistant/components/daikin/__init__.py
+++ b/homeassistant/components/daikin/__init__.py
@@ -17,6 +17,7 @@ from homeassistant.helpers.typing import HomeAssistantType
 from homeassistant.util import Throttle
 
 from . import config_flow  # noqa: F401
+from .const import TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -91,7 +92,7 @@ async def daikin_api_setup(hass, host):
 
     session = hass.helpers.aiohttp_client.async_get_clientsession()
     try:
-        with timeout(10):
+        with timeout(TIMEOUT):
             device = Appliance(host, session)
             await device.init()
     except asyncio.TimeoutError:
diff --git a/homeassistant/components/daikin/config_flow.py b/homeassistant/components/daikin/config_flow.py
index bd90a87db86..35f21ef3e0d 100644
--- a/homeassistant/components/daikin/config_flow.py
+++ b/homeassistant/components/daikin/config_flow.py
@@ -10,7 +10,7 @@ import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.const import CONF_HOST
 
-from .const import KEY_IP, KEY_MAC
+from .const import KEY_IP, KEY_MAC, TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -38,7 +38,7 @@ class FlowHandler(config_entries.ConfigFlow):
             device = Appliance(
                 host, self.hass.helpers.aiohttp_client.async_get_clientsession()
             )
-            with timeout(10):
+            with timeout(TIMEOUT):
                 await device.init()
         except asyncio.TimeoutError:
             return self.async_abort(reason="device_timeout")
diff --git a/homeassistant/components/daikin/const.py b/homeassistant/components/daikin/const.py
index ef24a51be89..15ae5321bf3 100644
--- a/homeassistant/components/daikin/const.py
+++ b/homeassistant/components/daikin/const.py
@@ -25,3 +25,5 @@ SENSOR_TYPES = {
 
 KEY_MAC = "mac"
 KEY_IP = "ip"
+
+TIMEOUT = 60
diff --git a/homeassistant/components/daikin/manifest.json b/homeassistant/components/daikin/manifest.json
index a752642335f..c501fa7c120 100644
--- a/homeassistant/components/daikin/manifest.json
+++ b/homeassistant/components/daikin/manifest.json
@@ -3,8 +3,7 @@
   "name": "Daikin AC",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/daikin",
-  "requirements": ["pydaikin==1.6.2"],
-  "dependencies": [],
-  "codeowners": ["@fredrike", "@rofrantz"],
+  "requirements": ["pydaikin==1.6.3"],
+  "codeowners": ["@fredrike"],
   "quality_scale": "platinum"
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 5c0c9559216..43a036b19f2 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1218,7 +1218,7 @@ pycsspeechtts==1.0.3
 # pycups==1.9.73
 
 # homeassistant.components.daikin
-pydaikin==1.6.2
+pydaikin==1.6.3
 
 # homeassistant.components.danfoss_air
 pydanfossair==0.1.0
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 4f9812c7113..f5318ffc955 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -479,7 +479,7 @@ pychromecast==4.2.0
 pycoolmasternet==0.0.4
 
 # homeassistant.components.daikin
-pydaikin==1.6.2
+pydaikin==1.6.3
 
 # homeassistant.components.deconz
 pydeconz==70