From 2b3f22c871adc40979101e684217b443d71db005 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Wed, 22 Jul 2020 21:43:51 -0700
Subject: [PATCH] Fix route53 depending on broken package (#38079)

---
 homeassistant/components/route53/__init__.py   | 10 +++-------
 homeassistant/components/route53/manifest.json |  2 +-
 requirements_all.txt                           |  3 ---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/route53/__init__.py b/homeassistant/components/route53/__init__.py
index cda4ba9dc86..1656ca393bf 100644
--- a/homeassistant/components/route53/__init__.py
+++ b/homeassistant/components/route53/__init__.py
@@ -4,7 +4,7 @@ import logging
 from typing import List
 
 import boto3
-from ipify import exceptions, get_ip
+import requests
 import voluptuous as vol
 
 from homeassistant.const import CONF_DOMAIN, CONF_TTL, CONF_ZONE, HTTP_OK
@@ -84,16 +84,12 @@ def _update_route53(
 
     # Get the IP Address and build an array of changes
     try:
-        ipaddress = get_ip()
+        ipaddress = requests.get("https://api.ipify.org/", timeout=5).text()
 
-    except exceptions.ConnectionError:
+    except requests.RequestException:
         _LOGGER.warning("Unable to reach the ipify service")
         return
 
-    except exceptions.ServiceError:
-        _LOGGER.warning("Unable to complete the ipfy request")
-        return
-
     changes = []
     for record in records:
         _LOGGER.debug("Processing record: %s", record)
diff --git a/homeassistant/components/route53/manifest.json b/homeassistant/components/route53/manifest.json
index da2b6dc092c..4879f12a3be 100644
--- a/homeassistant/components/route53/manifest.json
+++ b/homeassistant/components/route53/manifest.json
@@ -2,6 +2,6 @@
   "domain": "route53",
   "name": "AWS Route53",
   "documentation": "https://www.home-assistant.io/integrations/route53",
-  "requirements": ["boto3==1.9.252", "ipify==1.0.0"],
+  "requirements": ["boto3==1.9.252"],
   "codeowners": []
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 63e5d4e044d..35dd62e7e92 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -786,9 +786,6 @@ influxdb==5.2.3
 # homeassistant.components.iperf3
 iperf3==0.1.11
 
-# homeassistant.components.route53
-ipify==1.0.0
-
 # homeassistant.components.rest
 # homeassistant.components.verisure
 jsonpath==0.82