From 751f9843b482f276bbe6975eaa52be86059833e6 Mon Sep 17 00:00:00 2001
From: GmH <gmhoward@gmail.com>
Date: Tue, 15 May 2018 14:22:09 -0400
Subject: [PATCH] fixed issue #5974 for certbot-dns-route53 (#5984)

* fixed issue #5974 for certbot-dns-route53

* fixed issue #5967 for certbot-dns-digitalocean

* update to use acme.magic_typing and DefaultDict class

* added no-name-in-module identifier, for issue #5974

* added unused-import identifier to disable option, for issue #5974
---
 certbot-dns-route53/certbot_dns_route53/dns_route53.py | 4 +++-
 certbot-dns-route53/local-oldest-requirements.txt      | 2 +-
 certbot-dns-route53/setup.py                           | 2 +-
 mypy.ini                                               | 6 ++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/certbot-dns-route53/certbot_dns_route53/dns_route53.py b/certbot-dns-route53/certbot_dns_route53/dns_route53.py
index 27d185656..f71935de2 100644
--- a/certbot-dns-route53/certbot_dns_route53/dns_route53.py
+++ b/certbot-dns-route53/certbot_dns_route53/dns_route53.py
@@ -11,6 +11,8 @@ from certbot import errors
 from certbot import interfaces
 from certbot.plugins import dns_common
 
+from acme.magic_typing import DefaultDict, List, Dict # pylint: disable=unused-import, no-name-in-module
+
 logger = logging.getLogger(__name__)
 
 INSTRUCTIONS = (
@@ -34,7 +36,7 @@ class Authenticator(dns_common.DNSAuthenticator):
     def __init__(self, *args, **kwargs):
         super(Authenticator, self).__init__(*args, **kwargs)
         self.r53 = boto3.client("route53")
-        self._resource_records = collections.defaultdict(list)
+        self._resource_records = collections.defaultdict(list) # type: DefaultDict[str, List[Dict[str, str]]]
 
     def more_info(self):  # pylint: disable=missing-docstring,no-self-use
         return "Solve a DNS01 challenge using AWS Route53"
diff --git a/certbot-dns-route53/local-oldest-requirements.txt b/certbot-dns-route53/local-oldest-requirements.txt
index 8368d266e..724b61d3f 100644
--- a/certbot-dns-route53/local-oldest-requirements.txt
+++ b/certbot-dns-route53/local-oldest-requirements.txt
@@ -1,2 +1,2 @@
-acme[dev]==0.21.1
+-e acme[dev]
 certbot[dev]==0.21.1
diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py
index 84b701638..083cd15ae 100644
--- a/certbot-dns-route53/setup.py
+++ b/certbot-dns-route53/setup.py
@@ -8,7 +8,7 @@ version = '0.25.0.dev0'
 # Remember to update local-oldest-requirements.txt when changing the minimum
 # acme/certbot version.
 install_requires = [
-    'acme>=0.21.1',
+    'acme>0.24.0',
     'certbot>=0.21.1',
     'boto3',
     'mock',
diff --git a/mypy.ini b/mypy.ini
index 7e08a1f99..506c253a8 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -26,5 +26,11 @@ check_untyped_defs = True
 [mypy-certbot_dns_rfc2136.*]
 check_untyped_defs = True
 
+[mypy-certbot_dns_route53.*]
+check_untyped_defs = True
+
+[mypy-certbot_dns_digitalocean.*]
+check_untyped_defs = True
+
 [mypy-certbot_nginx.*]
 check_untyped_defs = True