From d842f268e5414f418e69913f6ac4fadffb327fb1 Mon Sep 17 00:00:00 2001
From: Wilfried Teiken <wteiken@google.com>
Date: Sat, 9 Jan 2016 17:07:20 -0500
Subject: [PATCH 1/3]     - Use dnspython3 fir py3X environments.     - Fix
 encoding for simple_verify.

---
 acme/acme/challenges.py |  4 ++--
 acme/setup.py           | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/acme/acme/challenges.py b/acme/acme/challenges.py
index 493d230d8..3fa259b13 100644
--- a/acme/acme/challenges.py
+++ b/acme/acme/challenges.py
@@ -271,8 +271,8 @@ class DNS01(KeyAuthorizationChallenge):
         :rtype: unicode
 
         """
-        return jose.b64encode(hashlib.sha256(
-            self.key_authorization(account_key)).digest())
+        return jose.b64encode(hashlib.sha256(self.key_authorization(
+            account_key).encode("utf-8")).digest()).decode()
 
     def validation_domain_name(self, name):
         """Domain name for TXT validation record.
diff --git a/acme/setup.py b/acme/setup.py
index c54dc42e6..df5cfba0e 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -35,9 +35,14 @@ if sys.version_info < (2, 7, 9):
     install_requires.append('ndg-httpsclient')
     install_requires.append('pyasn1')
 
-dns_extras = [
-    'dnspython',
-]
+if sys.version_info < (3, 0):
+    dns_extras = [
+        'dnspython',
+    ]
+else:
+    dns_extras = [
+        'dnspython3',
+    ]
 
 docs_extras = [
     'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags

From f2b52bd830457200474e98394b8aff0315e9d51f Mon Sep 17 00:00:00 2001
From: Wilfried Teiken <wteiken@google.com>
Date: Sun, 10 Jan 2016 12:58:29 -0500
Subject: [PATCH 2/3] Fix dcumentation

---
 acme/acme/challenges.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/acme/acme/challenges.py b/acme/acme/challenges.py
index 3fa259b13..a5b142c5b 100644
--- a/acme/acme/challenges.py
+++ b/acme/acme/challenges.py
@@ -226,7 +226,6 @@ class DNS01Response(KeyAuthorizationChallengeResponse):
         :param unicode domain: Domain name being verified.
         :param account_public_key: Public key for the key pair
             being authorized.
-        :param JWK account_public_key:
 
         :returns: ``True`` iff validation with the TXT records resolved from a
             DNS server is successful.

From 49c40e7a584d1d8faeac4436c6c7787e44a12b6d Mon Sep 17 00:00:00 2001
From: Wilfried Teiken <wteiken@google.com>
Date: Sun, 10 Jan 2016 13:00:38 -0500
Subject: [PATCH 3/3] Skip dns_resolver tests if dnspython is not available.

---
 acme/acme/dns_resolver_test.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/acme/acme/dns_resolver_test.py b/acme/acme/dns_resolver_test.py
index 2202ce4e8..0d5cc2543 100644
--- a/acme/acme/dns_resolver_test.py
+++ b/acme/acme/dns_resolver_test.py
@@ -1,11 +1,17 @@
 """Tests for acme.dns_resolver."""
 import unittest
 
-import dns
 import mock
 
+try:
+    import dns
+except ImportError:
+    dns = None
+
 from acme import dns_resolver
 
+@unittest.skipIf(dns is None,
+                 "dnspython is not available, skipping dns_resolver tests")
 class TxtRecordsForNameTest(unittest.TestCase):
 
     def create_txt_response(self, name, txt_records):