From 57c265c7f36087bb3de0f96a25cfcd8ae62538ab Mon Sep 17 00:00:00 2001
From: Wilfried Teiken <wteiken@google.com>
Date: Wed, 6 Jan 2016 00:27:07 -0500
Subject: [PATCH] Setup.py and style fixes

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

diff --git a/acme/acme/challenges.py b/acme/acme/challenges.py
index aa7b20689..f4eb115c4 100644
--- a/acme/acme/challenges.py
+++ b/acme/acme/challenges.py
@@ -713,11 +713,12 @@ def txt_records_for_name(name):
     """
     try:
         import dns.resolver
+        import dns.exception
         dns_response = dns.resolver.query(name, 'TXT')
     except ImportError as error:
         raise ImportError("Local validation for 'dns-01' challenges requires "
-                          "'dnspython'");
-    except Exception as error:
+                          "'dnspython'")
+    except dns.exception.DNSException as error:
         logger.error("Unable to resolve %s: %s", name, str(error))
         return []
     return [txt_rec for rdata in dns_response for txt_rec in rdata.strings]
diff --git a/acme/setup.py b/acme/setup.py
index 76a2c1b72..e00476117 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -75,7 +75,7 @@ setup(
     install_requires=install_requires,
     extras_require={
         'docs': docs_extras,
-        'testing': testing_extras + 'dnspython',
+        'testing': testing_extras + ['dnspython'],
     },
     entry_points={
         'console_scripts': [