aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2010-06-05 22:36:44 +0000
committerRob Austein <sra@hactrn.net>2010-06-05 22:36:44 +0000
commit27bc6de3bb992a08a7df843d58f781ed8c399d71 (patch)
treea36b38443918aaa20d77a049627128e83afa3c89
parent935f1206b62ac9b56c771cff645ff610bfed4a2e (diff)
Don't import rpki.adns unless we're using it
svn path=/rpkid/rpki/https.py; revision=3274
-rw-r--r--rpkid/rpki/https.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/rpkid/rpki/https.py b/rpkid/rpki/https.py
index 4ecb37ce..39260c17 100644
--- a/rpkid/rpki/https.py
+++ b/rpkid/rpki/https.py
@@ -33,7 +33,7 @@ PERFORMANCE OF THIS SOFTWARE.
"""
import time, socket, asyncore, asynchat, urlparse, sys, random
-import rpki.async, rpki.sundial, rpki.x509, rpki.exceptions, rpki.log, rpki.adns
+import rpki.async, rpki.sundial, rpki.x509, rpki.exceptions, rpki.log
import POW
## @var rpki_content_type
@@ -832,6 +832,7 @@ class http_client(http_stream):
elif self.host == "localhost":
self.gotaddrinfo(localhost_addrinfo())
else:
+ import rpki.adns # This should move to start of file once we've decided to inflict it on all users
rpki.adns.getaddrinfo(self.gotaddrinfo, self.dns_error, self.host, supported_address_families(enable_ipv6_clients))
def dns_error(self, e):