Skip to content

Adding flexible workaround for dnspython v1.x and v2.x #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ianhelle wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Adding flexible workaround for dnspython v1.x and v2.x #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ipwhois/net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ def __init__(self, address, timeout=5, proxy_opener=None):
self.timeout = timeout

self.dns_resolver = dns.resolver.Resolver()
if hasattr(self.dns_resolver, "resolve"):
self.dns_resolve = getattr(self.dns_resolver, "resolve")
else:
self.dns_resolve = getattr(self.dns_resolver, "query")

self.dns_resolver.timeout = timeout
self.dns_resolver.lifetime = timeout

Expand Down Expand Up @@ -220,7 +225,7 @@ def get_asn_dns(self):
try:

log.debug('ASN query for {0}'.format(self.dns_zone))
data = self.dns_resolver.resolve(self.dns_zone, 'TXT')
data = self.dns_resolve(self.dns_zone, 'TXT')
return list(data)

except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers,
Expand Down Expand Up @@ -262,7 +267,7 @@ def get_asn_verbose_dns(self, asn=None):
try:

log.debug('ASN verbose query for {0}'.format(zone))
data = self.dns_resolver.resolve(zone, 'TXT')
data = self.dns_resolve(zone, 'TXT')
return str(data[0])

except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

PACKAGE_DATA = {'ipwhois': ['data/*.xml', 'data/*.csv']}

INSTALL_REQUIRES = ['dnspython<=2.0.0', 'ipaddr==2.2.0;python_version<"3.3"']
INSTALL_REQUIRES = ['dnspython<=3.0.0', 'ipaddr==2.2.0;python_version<"3.3"']

setup(
name=NAME,
Expand Down